diff options
| author | Mats Erik Andersson <mats.andersson@gisladisker.se> | 2015-04-14 21:25:59 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-04-14 21:33:27 +0100 |
| commit | 6c4ac1b6651dd4d19abf1f3f758cd569b96ee968 (patch) | |
| tree | ff47cb4b89c0689494f84aa0050d9994a57c0527 /build-aux/git-version-gen | |
| parent | 35a0bf1d5353b0b43a2eedef01034bee3c4c110d (diff) | |
| download | gnulib-6c4ac1b6651dd4d19abf1f3f758cd569b96ee968.tar.gz | |
git-version-gen: revert "detect untagged revisions"
Revert commit bedd7833 as it breaks `make dist` in Inetutils
at least, due to the interdependencies with top/GNUMakefile,
which depend on the tag prefixes. This results in `make dist`
inducing a new call to autoconf where a simple tar-ball build
would be expected.
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index ddc0061766..8e92c0ad8e 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -189,16 +189,12 @@ 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 - if v=g`git describe --always HEAD 2>/dev/null`; then - v_from_git=1 - else - v=UNKNOWN - fi + v=UNKNOWN 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" |