From 511e2bf85a49566425567d1d627a423afe5f7a8e Mon Sep 17 00:00:00 2001 From: Bob Proulx Date: Thu, 21 Feb 2008 09:07:10 +0100 Subject: [PATCH] Enable use of older two part flavor 'git describe'. * build-aux/git-version-gen: If using the older two part flavor of git version then recreate the third part now present in the newer three part flavor of git describe. --- ChangeLog | 7 +++++++ build-aux/git-version-gen | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1c052ac43..b5e537d72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-20 Bob Proulx + + Enable use of older two part flavor 'git describe'. + * build-aux/git-version-gen: If using the older two part flavor of + git version then recreate the third part now present in the + newer three part flavor of git describe. + 2008-02-20 Martin Buchholz (tiny change) * lib/fts.c (fts_build): Typo correction to comment. diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 1d58adc72..1a0010705 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -59,6 +59,23 @@ elif test -d .git \ *) (exit 1) ;; esac then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + # Change the first '-' to a '.', so version-comparing tools work properly. # Remove the "g" in git describe's output string, to save a byte. v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; -- 2.11.0