On Tue, Jan 18, 2011 at 01:26:15PM -0800, Junio C Hamano wrote:
> Honestly, my guess is that the interaction of -S with a merge commit is
> "whatever the code happens to do", as I didn't think nor design how they
> should interact with each other when I wrote -c/--cc nor when I wrote -S.
That's kind of what I figured.
> Having said that, I tend to agree with your latter expectation ("what I
> want").
I'll take a look and see how painful it will be to do that. I'm not even
sure how the merge filepairs are represented by the diff code (since
they are not even pairs, but rather one child with many parents).
> By the way, you guys should really not be looking at the disused
> plumbing-helper -S but instead be advocating its newer and more human
> friendly cousin -G. 1.7.4 is coming ;-).
It's _way_ slower for simple things:
$ time git log -Sfoo >/dev/null
real 0m11.550s
user 0m11.409s
sys 0m0.116s
$ time git log -Gfoo >/dev/null
real 0m25.722s
user 0m25.442s
sys 0m0.220s
I for one really like the -S behavior, anyway, but I expect I am in the
minority.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html