diff: use blob path for blob/file diffs
When we diff a blob against a working tree file like: git diff HEAD:Makefile Makefile we always use the working tree filename for both sides of the diff. In most cases that's fine, as the two would be the same anyway, as above. And until recently, we used the "name" for the blob, not the path, which would have the messy "HEAD:" on the beginning. But when they don't match, like: git diff HEAD:old_path new_path it makes sense to show both names. This patch uses the blob's path field if it's available, and otherwise falls back to using the filename (in preference to the blob's name, which is likely to be garbage like a raw sha1). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 19, 2017 at 08:59 UTC
30d005c02014680403b5d35ef274047ab91fa5bd
2 files changed
+8
-2
builtin/diff.c
+2
-1
@@ -90,7 +90,8 @@ static int builtin_diff_b_f(struct rev_info *revs,
90
blob[0]->mode, canon_mode(st.st_mode),
91
&blob[0]->item->oid, &null_oid,
92
1, 0,
93
- path, path);
93
+ blob[0]->path ? blob[0]->path : path,
94
+ path);
95
diffcore_std(&revs->diffopt);
96
diff_flush(&revs->diffopt);
97
return 0;
t/t4063-diff-blobs.sh
+6
-1
@@ -81,11 +81,16 @@ test_expect_success 'diff blob against file' '
81
test_expect_success 'index of blob-file diff' '
82
check_index $sha1_one $sha1_two
83
'
84
-test_expect_failure 'blob-file diff uses filename as paths' '
84
+test_expect_success 'blob-file diff uses filename as paths' '
85
check_paths one two
86
'
87
test_expect_success FILEMODE 'blob-file diff shows mode change' '
88
check_mode 100644 100755
89
'
90
91
+test_expect_success 'blob-file diff prefers filename to sha1' '
92
+ run_diff $sha1_one two &&
93
+ check_paths two two
94
+'
95
+
96
test_done