X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fgit-version-gen;h=795a98b32364ca1fbf8a8f131ee6c12daa46fcf3;hb=add53559b5d05734b3b6b5ad5ec8333019e74703;hp=9b821e043942def430c357231aea479bb2c7d082;hpb=8ab5996c4a14364411442d93babb343cc2ce0d89;p=gnulib.git

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 9b821e043..795a98b32 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2010-05-28.15; # UTC
+scriptversion=2010-10-13.20; # UTC
 
 # Copyright (C) 2007-2010 Free Software Foundation, Inc.
 #
@@ -78,6 +78,9 @@ tag_sed_script="${2:-s/x/x/}"
 nl='
 '
 
+# Avoid meddling by environment variable of the same name.
+v=
+
 # First see if there is a tarball-only version file.
 # then try "git describe", then default.
 if test -f $tarball_version_file
@@ -95,7 +98,10 @@ fi
 if test -n "$v"
 then
     : # use $v
-elif test -d .git \
+# Otherwise, if there is at least one git commit involving the working
+# directory, and "git describe" output looks sensible, use that to
+# derive a version string.
+elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
     && 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"` \