From 6c4ac1b6651dd4d19abf1f3f758cd569b96ee968 Mon Sep 17 00:00:00 2001 From: Mats Erik Andersson Date: Tue, 14 Apr 2015 21:25:59 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 -------- build-aux/git-version-gen | 8 ++------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79f8811fce..95d49ec196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,14 +4,6 @@ * lib/tempname.c (try_dir): Tag with __GL_UNUSED. (try_nocreate): Likewise. -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 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" -- 2.39.5