From: Michael J Gruber <git@drmicha.warpmail.net>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Joshua Shrader <jshrader83@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: can git-describe learn first-parent behavior?
Date: Tue, 21 Sep 2010 13:49:17 +0200 [thread overview]
Message-ID: <4C989BBD.80106@drmicha.warpmail.net> (raw)
In-Reply-To: <4C98830A.70203@viscovery.net>
Johannes Sixt venit, vidit, dixit 21.09.2010 12:03:
> Am 9/21/2010 11:34, schrieb Michael J Gruber:
>> The earlier tag (in terms of depth) wins, yes.
>
> Does it? Then explain this result:
>
> git describe e5498e8a^2 e5498e8a^1~24 e5498e8a
> v1.7.0.7
> v1.7.1.1
> v1.7.1.1-38-ge5498e8
>
> v1.7.1.1 is 25 commits away, while v1.7.0.7 is a parent (the second).
>
> AFAICS, git-describe does The Right Thing (--first-parent).
I'm not saying it does the wrong thing. I'm saying it does not do
--first-parent but depth priority (where depth is a bit complicated),
which may or may not be the same as first-parent transversal/priority.
You picked one case where they coincide:
git describe --debug e5498e8a^2 e5498e8a^2~24 e5498e8a
v1.7.0.7
v1.7.0.5
searching to describe e5498e8a
annotated 38 v1.7.1.1
annotated 252 v1.7.1
annotated 268 v1.7.1-rc2
annotated 318 v1.7.1-rc1
annotated 355 v1.7.1-rc0
annotated 478 v1.7.0.7
annotated 492 v1.7.0.6
annotated 512 v1.7.0.5
annotated 539 v1.7.0.4
annotated 564 v1.7.0.3
traversed 1267 commits
more than 10 tags found; listed 10 most recent
gave up search at 97222d9634b5518cd3d328aa86b52746a16334a7
v1.7.1.1-38-ge5498e8
v1.7.1.1 clearly wins by depth priority.
In an example like Joshua's, it is obviously not the first parent which
wins by default:
* 771c6c7 (HEAD, master) more_development
* 88b63bd Merge branch 'maint'
|\
| * d99fb44 (tag: v1.1-stable, maint) v1.1-stable
* | c2f7480 development
* | 9480bca (tag: v2.0-base) v2.0-base
|/
* 31e78ef (tag: v1.0-stable) v1.0-stable
git describe --debug --tags HEAD
searching to describe HEAD
lightweight 4 v1.1-stable
lightweight 4 v2.0-base
lightweight 5 v1.0-stable
traversed 6 commits
v1.1-stable-4-g771c6c7
git describe --debug --tags --match v2\* HEAD
searching to describe HEAD
lightweight 4 v2.0-base
traversed 6 commits
v2.0-base-4-g771c6c7
git describe --debug --tags --first-parent HEAD
searching to describe HEAD
lightweight 3 v2.0-base
lightweight 4 v1.0-stable
traversed 5 commits
v2.0-base-3-g771c6c7
The latter is with my RFC PATCH, of course.
Note that without the commit "development", v2.0-base wins even in the
first case, even though this does not change the first-parent relationships.
Cheers
Michael
next prev parent reply other threads:[~2010-09-21 11:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 5:58 can git-describe learn first-parent behavior? Joshua Shrader
2010-09-21 9:34 ` Michael J Gruber
2010-09-21 9:35 ` [RFC PATCH] git-describe: introduce --first-parent Michael J Gruber
2010-09-21 10:03 ` can git-describe learn first-parent behavior? Johannes Sixt
2010-09-21 11:49 ` Michael J Gruber [this message]
2010-09-21 12:00 ` Johannes Sixt
2010-09-21 12:10 ` Michael J Gruber
2010-09-21 12:34 ` Johannes Sixt
2010-09-21 15:26 ` Michael J Gruber
2010-09-21 19:57 ` Joshua Shrader
2010-09-22 6:52 ` Michael J Gruber
2010-09-22 17:45 ` Joshua Shrader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C989BBD.80106@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jshrader83@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.