GNU bug report logs - #10923
git-version-gen reports wrong version after merge

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 10923 in the body.
You can then email your comments to 10923 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: BT Templeton <bpt <at> hcoop.net>
To: bug-guile <at> gnu.org
Subject: git-version-gen reports wrong version after merge
Date: Thu, 01 Mar 2012 20:22:50 -0500

After merging a branch, version.test is failing, apparently because
"git-version-gen" is generating an incorrect version number:

#+begin_example
olor:~/src/guile(master)% ./build-aux/git-version-gen .tarball-version
2.0.5.351-1c3ec
olor:~/src/guile(master)% grep = GUILE-VERSION | head -3
GUILE_MAJOR_VERSION=2
GUILE_MINOR_VERSION=1
GUILE_MICRO_VERSION=0
olor:~/src/guile(master)% git describe
v2.0.5-351-g1c3ecea
olor:~/src/guile(master)% git describe --match v2.1\*
v2.1.0-532-g1c3ecea
#+end_example

I assume that the v2.0.5 tag is simply closer in the commit graph than
v2.1.0 (if git is looking at both parents of the merge commit). I'm not
sure what the correct solution is, but this page describes some possible
workarounds:
<http://www.xerxesb.com/2010/git-describe-and-the-tale-of-the-wrong-commits/>

-- 
Inteligenta persono lernas la lingvon Esperanton rapide kaj facile.
Esperanto estas moderna, kultura lingvo por la mondo. Simpla, fleksebla,
belsona, Esperanto estas la praktika solvo de la problemo de universala
interkompreno. Lernu la interlingvon Esperanton!

Message #10 received at 10923-done <at> debbugs.gnu.org (full text, mbox):

From: Andy Wingo <wingo <at> pobox.com>
To: BT Templeton <bpt <at> hcoop.net>
Cc: 10923-done <at> debbugs.gnu.org
Subject: Re: bug#10923: git-version-gen reports wrong version after merge
Date: Fri, 06 Jul 2012 16:59:03 +0200

On Fri 02 Mar 2012 02:22, BT Templeton <bpt <at> hcoop.net> writes:

> After merging a branch, version.test is failing, apparently because
> "git-version-gen" is generating an incorrect version number:

I believe I have fixed this on stable-2.0 and master.  Please let me
know if it does not work for you.

Cheers,

Andy
-- 
http://wingolog.org/

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.