Re: log -S with evil merges

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 12, 2010, 06:39 UTC
Message-ID: <20100712063949.GA6301@burratino>
In-Reply-To: <7v39vpfcte.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> Jonathan Nieder <jrnieder@gmail.com> writes:

Show 6 quoted lines

>>  ; git log --oneline -c -S'UE_ALWAYS' --follow builtin/reflog.c
>>
>> does not work --- it mentions _all_ merges.  Why?
>
> I don't think --follow, which is merely a checkbox item, is friendly to
> most other git features.

Hmm, leaving out the --follow makes it behave again.  Thanks for the tip.

> Does it even show diff with the corresponding
> file at the commit where filename is changed?

 $ git tag lt/deepen-builtin-source 81b50f3
 $ git diff --raw --follow lt/deepen-builtin-source^! -- builtin/reflog.c
 :100644 100644 7498210... 7498210... R100	builtin-reflog.c	builtin/reflog.c
 $ git diff-tree --abbrev -c --follow v1.7.2-rc0~122 -- builtin/reflog.c
 a660534e06147f8867d6c9b6c41025427a7b5c6c
 ::100644 100644 100644 f732156... fafb740... ebf610e... MR      builtin/reflog.c

Looks good to me...