Mercurial > hg > octave-jordi > gnulib-hg
changeset 17960:1c04e5182252
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.
| author | Mats Erik Andersson <mats.andersson@gisladisker.se> |
|---|---|
| date | Tue, 14 Apr 2015 21:25:59 +0100 |
| parents | f34f37b02fc9 |
| children | 19e7a05866b5 |
| files | ChangeLog build-aux/git-version-gen |
| diffstat | 2 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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 <gnu@gisladisker.se> - - 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 <hiramatu@boreas.dti.ne.jp> fseeko: fix build failure on NetBSD >= 6 (trivial)
--- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -189,16 +189,12 @@ 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"