From: Junio C Hamano <gitster@pobox•com>
To: "Bernhard R. Link" <brl+git@mail•brlink.eu>
Cc: git@vger•kernel.org
Subject: Re: [RFC v2] blame: new option --prefer-first to better handle merged cherry-picks
Date: Mon, 13 Jan 2014 17:00:46 -0800 [thread overview]
Message-ID: <xmqq7ga35qdd.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqbnzf5vvu.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 13 Jan 2014 15:01:41 -0800")
Junio C Hamano <gitster@pobox•com> writes:
>> While the result is more consistent and more predictable in the case
>> of merged cherry picks, it is also slower in every case.
>
> Consistent and predictable, perhaps, but I am not sure "exact" would
> be a good word.
Another thing I am not enthusiasitc about this change is that I am
afraid that this may make "git blame -- path" and "git log -- path"
work inconsistenly. The both cull side branches whenever one of the
parents gave the resulting blob, even that parent is not the first
one. But "git blame --prefer-first -- path", afaict, behaves quite
differently from "git log --first-parent -- path", even though they
share similar option names, adding more to the confusion.
next prev parent reply other threads:[~2014-01-14 1:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 6:30 [RFC v2] blame: new option --prefer-first to better handle merged cherry-picks Bernhard R. Link
2014-01-13 22:26 ` Junio C Hamano
2014-01-13 22:52 ` Bernhard R. Link
2014-01-13 23:01 ` Junio C Hamano
2014-01-14 1:00 ` Junio C Hamano [this message]
2014-01-14 8:37 ` Junio C Hamano
2014-01-14 19:12 ` 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=xmqq7ga35qdd.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=brl+git@mail$(echo .)brlink.eu \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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