From: Jonathan Nieder <jrnieder@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: maximilian attems <max@stro.at>,
Tay Ray Chuan <rctay89@gmail.com>,
git@vger.kernel.org
Subject: Re: bug in name-rev on linux-2.6 repo?
Date: Thu, 22 Apr 2010 09:51:11 -0500 [thread overview]
Message-ID: <20100422145111.GA4801@progeny.tock> (raw)
In-Reply-To: <m2hbn37e7q.fsf@igel.home>
Andreas Schwab wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>> The commit doesn’t seem to be part of any tagged release, nor linus’s
>> master:
>
> $ git branch --contains a1de02dccf906faba2ee2d99cac56799bda3b96a
> * master
> $ git merge-base v2.6.34-rc1 a1de02dccf906faba2ee2d99cac56799bda3b96a
> a1de02dccf906faba2ee2d99cac56799bda3b96a
> git merge-base v2.6.33 a1de02dccf906faba2ee2d99cac56799bda3b96a
> 724e6d3fe8003c3f60bf404bf22e4e331327c596
>
> So it has been merged beween v2.6.33 and v2.6.34-rc1
To first commit after rc8, to be exact. But for some reason, the
revision walker doesn’t notice that:
$ git rev-list origin/master..a1de02dcc | wc -l
1
The tip of the relevant branch before merging was 64e290e (thanks to
Johan’s --ancestor-path suggestion and Junio’s nice implementation).
So we can walk up through the revisions:
$ git rev-parse 64e290e~35
a1de02dccf906faba2ee2d99cac56799bda3b96a
$ git rev-list origin/master..64e290e~35 | wc -l
0
$ git rev-list origin/master..$(git rev-parse 64e290e~35) | wc -l
1
$ for i in 36 35 34 33 32 31 30
> do
> printf "%d " "$i"
> git rev-list origin/master..$(git rev-parse 64e290e~$i) | wc -l
> done
36 0
35 1
34 2
33 3
32 4
31 0
30 0
Using v2.6.34-rc1~199 (the ext4 merge commit) instead of origin/master
reveals the same problem. v2.6.34-rc1~199^2 (the tip of the ext4
branch) does not.
Hope that helps.
Jonathan
prev parent reply other threads:[~2010-04-22 14:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-21 19:58 bug in name-rev on linux-2.6 repo? maximilian attems
2010-04-22 10:54 ` Tay Ray Chuan
2010-04-22 12:14 ` maximilian attems
2010-04-22 12:40 ` Jonathan Nieder
2010-04-22 14:29 ` Andreas Schwab
2010-04-22 14:44 ` Jeff King
2010-04-22 14:54 ` Jeff King
2010-04-22 15:03 ` Jonathan Nieder
2010-04-22 15:17 ` Jeff King
2010-04-22 16:25 ` Jonathan Nieder
2010-04-22 18:20 ` Linus Torvalds
2010-04-24 23:04 ` tytso
2010-04-22 14:51 ` Jonathan Nieder [this message]
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=20100422145111.GA4801@progeny.tock \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=max@stro.at \
--cc=rctay89@gmail.com \
--cc=schwab@linux-m68k.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 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.