* bug#10923: git-version-gen reports wrong version after merge
@ 2012-03-02 1:22 BT Templeton
2012-07-06 14:59 ` Andy Wingo
0 siblings, 1 reply; 2+ messages in thread
From: BT Templeton @ 2012-03-02 1:22 UTC (permalink / raw)
To: 10923
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#10923: git-version-gen reports wrong version after merge
2012-03-02 1:22 bug#10923: git-version-gen reports wrong version after merge BT Templeton
@ 2012-07-06 14:59 ` Andy Wingo
0 siblings, 0 replies; 2+ messages in thread
From: Andy Wingo @ 2012-07-06 14:59 UTC (permalink / raw)
To: BT Templeton; +Cc: 10923-done
On Fri 02 Mar 2012 02:22, BT Templeton <bpt@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/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-06 14:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-02 1:22 bug#10923: git-version-gen reports wrong version after merge BT Templeton
2012-07-06 14:59 ` Andy Wingo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).