Re: -p diff output and the 'Index:' line

From: Junio C Hamano <junkio@cox.net>
Date: May 29, 2005, 18:04 UTC
Message-ID: <7vekbpq56r.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050529120248.GD1036@pasky.ji.cz>

>>>>> "PB" == Petr Baudis <pasky@ucw.cz> writes:

Show 5 quoted lines

>> Like Linus, I do "/^diff --git .*" in my less sessions, which
>> gives a very nice highlighted separator line without wasting a
>> single line on the terminal.  If any of the readers on the list
>> didn't know about this trick (especially the trailing .* part),
>> please try it.  I'm certain everybody would love it.

PB> When I do just cg-diff to see what I changed I usually do not pipe it to PB> less, and typing that / stuff seems insane (although /^d.* could give a PB> good approximation).

You said you do not do "less", so the following may not apply to your usage, but I disagree your comment about "typing that / stuff seems insane". Sean's workaround to use "less -p '^diff --git .*'" in a script, combined with typing 'n' in a "less" session to find the next such line, would make it very pleasant to use.

PB> OTOH I think I'll go for the diff output colorification (at PB> the Cogito level), so the separator indeed isn't strictly PB> necessary. I can live without it. :-)

When I want to make a customized diff output out of the "diff-* -p' command, I find it a lot easier to use the GIT_EXTERNAL_DIFF mechanism than parsing what comes out of "diff-* -p" and munging it. I am not _telling_, _ordering_, nor even _asking_ you to use GIT_EXTERNAL_DIFF; just suggesting you to consider that as a way to possibly make your implementation easier. I'd start from the supplied git-external-diff-script and go from there.