From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 May 2006 21:35:37 +0000 (-0700)
Subject: builtin-diff: do not say files are renamed when blob and file are given
X-Git-Tag: v1.4.0-rc1~127
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=065e0b126f47e0c280da6830956766ff2ea8cf17;p=git.git

builtin-diff: do not say files are renamed when blob and file are given

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-diff.c b/builtin-diff.c
index b0c9cade..de81b05e 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -122,7 +122,7 @@ static int builtin_diff_b_f(struct rev_info *revs,
 	stuff_change(&revs->diffopt,
 		     canon_mode(st.st_mode), canon_mode(st.st_mode),
 		     blob[0].sha1, null_sha1,
-		     blob[0].name, path);
+		     path, path);
 	diffcore_std(&revs->diffopt);
 	diff_flush(&revs->diffopt);
 	return 0;