diff options
| author | Mats Erik Andersson <gnu@gisladisker.se> | 2015-04-13 23:00:35 +0200 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-04-14 11:39:11 +0100 |
| commit | bedd7833ac4e2e39189471a665048a056295c1cb (patch) | |
| tree | 7a8e2ca643865ca6c8cedff839000569ca7ea348 /build-aux/git-version-gen | |
| parent | f2c88dc1288e425e5eb259a366b8ade4e1632bc6 (diff) | |
| download | gnulib-bedd7833ac4e2e39189471a665048a056295c1cb.tar.gz | |
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!
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 8 |
1 files changed, 6 insertions, 2 deletions
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" |