git-version-gen: don't require that .git/ be in the current dir

* build-aux/git-version-gen: Adjust this script so that it works
when run from any working directory beneath the top-level .git/-
containing directory.  Inspired by a patch from Giusseppe Scrivano,
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/21843/focus=21847

diff --git a/ChangeLog b/ChangeLog
index e7838e1109c687cf9f440a735bd5a261e7daa3bc..9a4ed578f11f043e7281819e91eed62ee2736e6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-13  Jim Meyering  <meyering@redhat.com>
 
+       git-version-gen: don't require that .git/ be in the current dir
+       * build-aux/git-version-gen: Adjust this script so that it works
+       when run from any working directory beneath the top-level .git/-
+       containing directory.  Inspired by a patch from Giusseppe Scrivano,
+       http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/21843/focus=21847
+
        test-select: avoid warn_unused_result warnings
        * tests/test-select.c: Include "macros.h".
        ASSERT that each call to read, write, and pipe succeeds.

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 5617eb8d4ea774664e9d73db31a0975cd4d42f99..6262775876f81d6ca6d9dcfb4cad521259e890f6 100755 (executable)
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2010-06-14.19; # UTC
+scriptversion=2010-10-13.14; # UTC
 
 # Copyright (C) 2007-2010 Free Software Foundation, Inc.
 #
@@ -98,7 +98,9 @@ fi
 if test -n "$v"
 then
     : # use $v
-elif test -d .git \
+# Otherwise, if we're anywhere beneath a .git directory, and "git describe"
+# output looks sensible, use that to derive a version string.
+elif git rev-parse --verify HEAD > /dev/null 2>&1 \
     && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
          || git describe --abbrev=4 HEAD 2>/dev/null` \
     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \