From 53dd8a9cb524ac2bd99072d86ee31ee48c99d0be Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 3 Aug 2006 11:57:11 -0700 Subject: 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 diff --git a/builtin-diff.c b/builtin-diff.c index ec27542..cb4216e 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; -- cgit v0.10.2-6-g49f6