summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-03 11:57:11 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-03 14:41:53 -0700
commit53dd8a9cb524ac2bd99072d86ee31ee48c99d0be (patch)
tree18634b872986a346d716facf5b968906f0c1439b /builtin-diff.c
parentef677686efe1868432d3cc9d4c41a93b44f3def8 (diff)
downloadgit-53dd8a9cb524ac2bd99072d86ee31ee48c99d0be.tar.gz
Show both blob names from "git diff blob1 blob2"
Earlier we deliberately showed only blob1's name because showing both names labeled the output as a renaming patch. Now the output routine (namely, diff.c::resolve_rename_copy()) is taught not to use pathname comparison to tell if a filepair is a rename, we can safely do this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index ec27542d48..cb4216eb8a 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -133,7 +133,7 @@ static int builtin_diff_blobs(struct rev_info *revs,
stuff_change(&revs->diffopt,
mode, mode,
blob[0].sha1, blob[1].sha1,
- blob[0].name, blob[0].name);
+ blob[0].name, blob[1].name);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;