From: Greg KH <gregkh@linuxfoundation.org>
To: git@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Subject: Funny 'git describe --contains' output
Date: Tue, 28 Aug 2012 21:48:40 -0700 [thread overview]
Message-ID: <20120829044840.GA25869@kroah.com> (raw)
Hi,
In the Linux kernel tree, commit 0136db586c028f71e7cc21cc183064ff0d5919
is a bit "odd".
If I go to look to see what release it was in, I normally do:
$ git describe --contains 0136db586c028f71e7cc21cc183064ff0d5919
v3.6-rc1~59^2~56^2~76
However, it really showed up first in the 3.5-rc1 kernel release, as can
be seen by doing the following:
$ git tag --contains 0136db586c028f71e7cc21cc183064ff0d5919
v3.5
v3.5-rc1
v3.5-rc2
v3.5-rc3
v3.5-rc4
v3.5-rc5
v3.5-rc6
v3.5-rc7
v3.6-rc1
v3.6-rc2
v3.6-rc3
This commit ended up coming into Linus's tree in two different places,
both in 3.5-rc1 and in 3.6-rc1, through different merge requests, so it
seems to be tricky to figure out when it "first" went in.
Asking Linus about this, he tried the following:
$ git name-rev --tags 0136db586c028f71e7cc21cc183064ff0d5919
0136db586c028f71e7cc21cc183064ff0d5919 tags/v3.6-rc1~59^2~56^2~76
$ git rev-list 0136db586c028f71e7cc21cc183064ff0d5919..v3.5-rc1 | wc
11415 11415 468015
$ git rev-list 0136db586c028f71e7cc21cc183064ff0d5919..v3.4-rc1 | wc
0 0 0
$ git rev-list 0136db586c028f71e7cc21cc183064ff0d5919..v3.6-rc1 | wc
22279 22279 913439
which shows that there are "less" commits to get from this commit to
v3.5-rc1 instead of v3.6-rc1, so something odd is going on here.
Any ideas?
I can reproduce this right now with git version 1.7.12.116.g31e0100
thanks,
greg k-h
next reply other threads:[~2012-08-29 4:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-29 4:48 Greg KH [this message]
2012-08-29 5:57 ` Funny 'git describe --contains' output Junio C Hamano
2012-08-29 6:36 ` Junio C Hamano
2012-08-29 18:17 ` Greg KH
2012-08-29 21:17 ` [PATCH 0/3] "git name-rev --weight" Junio C Hamano
2012-08-29 21:17 ` [PATCH 1/3] name-rev: lose unnecessary typedef Junio C Hamano
2012-08-29 21:17 ` [PATCH 2/3] name_rev: clarify when a new tip-name is assigned to a commit Junio C Hamano
2012-08-29 21:17 ` [PATCH 3/3] name-rev: --weight option (WIP) Junio C Hamano
2012-08-29 23:37 ` Junio C Hamano
2012-08-30 3:36 ` Jeff King
2012-08-30 3:53 ` Junio C Hamano
2012-08-30 3:55 ` Jeff King
2012-08-30 4:10 ` Junio C Hamano
2012-08-30 4:15 ` Junio C Hamano
2012-08-30 15:59 ` Junio C Hamano
2012-08-30 3:51 ` Jeff King
2012-08-30 4:09 ` Junio C Hamano
2012-08-30 7:06 ` [PATCH 0/3] "git name-rev --weight" Philip Oakley
2012-08-30 15:54 ` Junio C Hamano
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=20120829044840.GA25869@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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 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 NNTP newsgroup(s).