Re: git-rm failure

[Bruno Haible]

Hi Karl,

> the make ends with:
>     if test -f archive.dir.tar.gz; then \
>               inputfile=archive.dir.tar.gz; \
>             else \
>               inputfile='.'/archive.dir.tar.gz; \
>             fi; \
>             ./convert-archive dir git "$inputfile" archive.git.tar.gz
>     Created initial commit c2422b3: Empty directory
>     Created commit a2060f0: Import gettext-0.10.35
>     usage: git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] 
> <file>...
>     [Followed by numerous similar errors.]

Your git version must be 1.5.x or similar. (If it were 1.6 or newer, it would
understand the "git rm -q" command. If it were older than 1.5, the build would
already fail in the "git init" command.)

> It works fine when I say --without-git.

Yes, this is one option you have. The other one is to install a newer 'git'.
(The current version is 1.7.1.)

> I suppose I have an old version of git.  Perhaps a suitable git should
> be checked for in configure, instead of relying on the user to know what
> to do?

The user is supposed to look at the INSTALL file. The first section in the
INSTALL file tells him to look at the DEPENDENCIES file. There, a minimum
version of 1.6 is specified.

But you're right, it does not hurt to encode this requirement also in the
configuration. I'm applying the patch below.

> Or default to the plain archive unless --with-git or --with-cvs?

This also has its drawbacks: The huge size of the archive.dir.tar.gz.

> Just in case it matters, the previous gettext-0.18.1 release (size
> 15141006) failed at the same place but in a different way:
>             ./convert-archive dir git "$inputfile" archive.git.tar.gz
>     mkdir: cannot create directory 
> `/usr/local/gnu/src/gettext-0.18.1/gettext-tools/misc/unpacked-files': File 
> exists
>     convert-archive: *** directory 
> /usr/local/gnu/src/gettext-0.18.1/gettext-tools/misc/unpacked-files already 
> exists
>     convert-archive: *** Stop.
>     make[2]: *** [archive.git.tar.gz] Error 1

This error is a consequence of an earlier error. Removing the 'unpacked-files'
directory should fix it.

Bruno


2010-06-06  Bruno Haible  <address@hidden>

        * configure.ac (ARCHIVE_FORMAT): If neither --with-git nor --with-cvs
        is specified, don't use the git format if the 'git' program if older
        than version 1.6.
        Suggested by Karl Berry <address@hidden>.

*** gettext-tools/configure.ac.orig     Sun Jun  6 14:57:15 2010
--- gettext-tools/configure.ac  Sun Jun  6 14:54:52 2010
***************
*** 338,346 ****
      ARCHIVE_FORMAT=cvs
    else
      # Neither --with-git nor --with-cvs is specified.
!     if test "$gt_use_git" != no && (git --version) >/dev/null 2>&1; then
!       # --without-git is not specified, and the git program exists.
!       # Use git format.
        ARCHIVE_FORMAT=git
      else
        # --without-git is specified, or the git program is missing.
--- 338,352 ----
      ARCHIVE_FORMAT=cvs
    else
      # Neither --with-git nor --with-cvs is specified.
!     if test "$gt_use_git" != no \
!        && (git --version) >/dev/null 2>&1 \
!        && { case `git --version | sed -e 's/^[^0-9]*//'` in
!               0.* | 1.[0-5].*) false ;;
!               *) true ;;
!             esac
!           }; then
!       # --without-git is not specified, and the git program exists
!       # in version 1.6 or newer. Use git format.
        ARCHIVE_FORMAT=git
      else
        # --without-git is specified, or the git program is missing.