kdevelop git/master branch tag

[René J.V. Bertin]

On Wednesday August 31 2016 18:12:06 Sven Brauch wrote:

> > Which corresponds exactly to the number of commits since the v5.0.0 tag was created.
> > Is it possible that this was somehow pushed to a wrong branch, i.e. the origin/5.0 branch?
> 
> But that is the correct branch. If you try git branch --contains v5.0.0,
> it also shows both master and 5.0 (as it should be).

Actually, when I do that it only shows the master branch, which only adds to the mystery ...

> So the merge was
> also done correctly. No idea why it's not picked up.

Yeah; git describe "finds the most recent tag that is reachable from a commit". The only thing that I see that would explain this is if somehow the 4.90.91 tag was set after the v5.0.0 tag, or if the merge inserted the v5 tag before the v4.90.91 tag, for some reason. IIRC I have seen non-chronological commits showing up in kdevelop's `git log`. I don't know how one could manage those, but maybe the regular merging has something to do with it?

Maybe worth asking around on the git IRC channel. Or maybe the following forensics may help?

%> git describe --debug
searching to describe HEAD
 annotated        529 v4.90.91
 annotated        713 v4.90.90
 annotated       2567 v5.0.0
 annotated       2655 v4.7.3
 annotated       2665 v4.7.2
 annotated       2685 v4.7.1
 annotated       2734 v4.7.0
 annotated       2764 v4.6.90
 annotated       3200 v4.6.0
 annotated       3259 v4.5.80
traversed 3301 commits
more than 10 tags found; listed 10 most recent
gave up search at 7d414e58eab560b66890ae8f83aff371387c17b3
v4.90.91-529-gf9b262c
%> git describe --match "v5*" --debug
searching to describe HEAD
finished search at 0bd644e15db1cfeba7e8aa709dbb3b2bdc75cc26
 annotated       3396 v5.0.0
traversed 14424 commits
v5.0.0-3396-gf9b262c

Note the different commit log depths for the v5.0.0 tags found (2567 and 3396). Could it be that there are TWO v5.0.0 tags in the master branch?

For comparison, this is what those command return in my kdevplatform working copy:
searching to describe HEAD
 annotated        173 v5.0.0
 annotated        476 v4.90.91
 annotated        482 rm
 annotated        673 v4.90.90
 annotated       2030 v1.7.3
 annotated       2042 v1.7.2
 annotated       2058 v1.7.1
 annotated       2099 v1.7.0
 annotated       2142 v1.6.90
 annotated       2662 v1.6.0
traversed 2699 commits
more than 10 tags found; listed 10 most recent
gave up search at dfed516d5db9ab00e7bc807d9176553c39a282fc
v5.0.0-173-g664d2fc

searching to describe HEAD
finished search at 606e37c03846b1fce26fa121b27c414bc438c82d
 annotated        173 v5.0.0
traversed 12050 commits
v5.0.0-173-g664d2fc

R