diff options
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 5617eb8d..795a98b3 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-06-14.19; # UTC +scriptversion=2010-10-13.20; # UTC # Copyright (C) 2007-2010 Free Software Foundation, Inc. # @@ -98,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"` \ |