From: Mats Erik Andersson Date: Mon, 13 Apr 2015 21:00:35 +0000 (+0200) Subject: git-version-gen: detect untagged revisions X-Git-Tag: v1.0~7100 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=bedd7833;p=gnulib.git git-version-gen: detect untagged revisions * build-aux/git-version-gen: If fallback string is empty, but git is available, use "git describe --always" to extract a revision, and prefix it with "g". This is much better than responding "UNKNOWN" and it applies to shallow clones! --- diff --git a/ChangeLog b/ChangeLog index df79036be7..3e3dfb5d39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-04-14 Mats Erik Andersson + + git-version-gen: detect untagged revisions + * build-aux/git-version-gen: If fallback string is empty, + but git is available, use "git describe --always" to extract + a revision, and prefix it with "g". This is much better than + responding "UNKNOWN" and it applies to shallow clones! + 2015-04-14 HIRAMATSU Yoshifumi fseeko: fix build failure on NetBSD >= 6 (trivial) diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 8e92c0ad8e..ddc0061766 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -189,12 +189,16 @@ then v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; v_from_git=1 elif test "x$fallback" = x || git --version >/dev/null 2>&1; then - v=UNKNOWN + if v=g`git describe --always HEAD 2>/dev/null`; then + v_from_git=1 + else + v=UNKNOWN + fi else v=$fallback fi -v=`echo "$v" |sed "s/^$prefix//"` +v=`echo "$v" | sed "s/^$prefix//"` # Test whether to append the "-dirty" suffix only if the version # string we're using came from git. I.e., skip the test if it's "UNKNOWN"