From: Petr Baudis Date: Sun, 29 May 2005 19:03:05 GMT Subject: Re: -p diff output and the 'Index:' line Message-ID: <20050529190305.GP1036@pasky.ji.cz> In-Reply-To: <7vekbpq56r.fsf@assigned-by-dhcp.cox.net> Dear diary, on Sun, May 29, 2005 at 08:04:44PM CEST, I got a letter where Junio C Hamano told me that... > 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. (As long as you don't want to search for something else. ;-) But yes, I like the less -p hack. > 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. It's just something along the lines of "Me Og. Og sees /^+/. Og makes the line green." written in gawk (actually I'm not sure if pure awk wouldn't do, but I actually don't know the language), so I don't think the external diff thing would've helped me with that in any way. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor