Re: [PATCH 2/4] Tweak diff output further to make it a bit less distracting.

From: Junio C Hamano <junkio@cox.net>
Date: May 17, 2005, 22:25 UTC
Message-ID: <7vsm0lqym3.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.58.0505171227260.18337@ppc970.osdl.org>

>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> So I'd really suggest having just a flag that says "pure old diff format" LT> or "new diff format with renames", and if the latter is selected, then do LT> _just_ the changes, ie the rename+change case would really boil down to LT> getting just

That is sensible. So the with --detect-rename flag, we do rename detection and show only the changes, otherwise we do not do rename detection and give pure old diff (two diffs against /dev/null, that is). I do not personally think --detect-rename with --output-old-style-diff is useful.

Now, in the new diff format, if the rename is really a pure rename, then we would have:

     diff -git a/nitfol b/nitfol
     rename old frotz
     rename new nitfol
     diff -git a/rezrov b/rezrov
     --- a/rezrov
     +++ b/rezrov
     @@ ...

that is, nothing until the patch for the next file or EOF. Is this acceptable?