From: Junio C Hamano <gitster@pobox.com>
To: Kevin Bracey <kevin@bracey.fi>
Cc: git@vger.kernel.org
Subject: Re: breakage in revision traversal with pathspec
Date: Tue, 10 Sep 2013 15:23:50 -0700 [thread overview]
Message-ID: <xmqq38pcwc21.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <522F8ED2.9000408@bracey.fi> (Kevin Bracey's message of "Wed, 11 Sep 2013 00:27:46 +0300")
Kevin Bracey <kevin@bracey.fi> writes:
> On 10/09/2013 20:19, Junio C Hamano wrote:
>> I am grumpy X-<.
>>
>> It appears that we introduced a large breakage during 1.8.4 cycle to
>> the revision traversal machinery and made pathspec-limited "git log"
>> pretty much useless.
>>
>> This command
>>
>> $ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl
>>
>> reports that a merge 766f0f8ef7 (which did not touch the specified
>> path at all) touches it.
>>
>> Bisecting points at d0af663e (revision.c: Make --full-history
>> consider more merges, 2013-05-16).
>>
> That merge appearing *with* --full-history would seem like correct
> behaviour to me. Or at least it's what I intended.
Oh, of course. "--full-history" is about showing any pointless
change, "the mainline was a lot more up-to-date and there were
changes relative to a fork based on an older baseline", so your
updated "log" should show that in the mainline git-cvsserver.perl
has been more fresh when that merge happened. But it shouldn't
appear if the user does not ask for "--full-history".
> However, your particular example occurs *without*--full-history, which
> suggests a problem.
Yes.
> I note that "gitk v1.8.3^0..v1.8.4" and "git log --parents
> v1.8.3..v1.8.4" show that merge in Git 1.8.3, but not in Git 1.8.4. So
> we're going partially forwards, at least.
With the testcases demonstrating the cases your series fixed that
all look sensible, I think it is not really an option for us to
revert them; you do not have to defend it with "we are going
partially forwards" ;-).
next prev parent reply other threads:[~2013-09-10 22:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 17:19 breakage in revision traversal with pathspec Junio C Hamano
2013-09-10 21:27 ` Kevin Bracey
2013-09-10 22:23 ` Junio C Hamano [this message]
2013-09-11 17:49 ` Kevin Bracey
2013-09-11 18:24 ` Jonathan Nieder
2013-09-11 19:21 ` Junio C Hamano
2013-09-11 19:39 ` Kevin Bracey
2013-09-11 21:15 ` Junio C Hamano
2013-09-19 21:35 ` Junio C Hamano
2013-09-20 3:35 ` Jeff King
2013-09-20 4:58 ` Junio C Hamano
2013-09-20 5:11 ` Jeff King
2013-09-20 17:51 ` Junio C Hamano
2013-09-25 9:12 ` Jeff King
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=xmqq38pcwc21.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kevin@bracey.fi \
/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).