[PATCH] Fix diff.c to match rename extended header to the document.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jun 5, 2005, 22:25 UTC
- Message-ID
- <7vekbg1lw9.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.58.0506051509490.1876@ppc970.osdl.org>
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
LT> On Sun, 5 Jun 2005, Junio C Hamano wrote:
>> >> The documentation failed to describe "diff --git" extended diff >> headers, so add some.
LT> You document the "rename" header as being "rename from/to", which is LT> sensible, but doesn't match reality. diff.c has "rename old/new". I found LT> that out the hard way when doing git-apply ;)
LT> I'd almost prefer fixing diff.c (and now apply.c). Comments?
Yes, sir ;-).
------------ This matches the git extended header to what is documented. There is no need to touch git-external-diff-script since it gets the string generated here and simply spits it out.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- cd /opt/packrat/playpen/public/in-place/git/git.junio/ jit-diff # - linus: git-apply: fix rename header parsing # + (working tree)
diff --git a/diff.c b/diff.c --- a/diff.c +++ b/diff.c @@ -786,8 +786,8 @@ static void diff_flush_patch(struct diff case 'R': sprintf(msg_, "similarity index %d%%\n" - "rename old %s\n" - "rename new %s", + "rename from %s\n" + "rename to %s", (int)(0.5 + p->score * 100.0/MAX_SCORE), p->one->path, p->two->path); msg = msg_; Compilation finished at Sun Jun 5 15:23:44