Diff between two blobs should take mode changes into account now.

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

Diff between two blobs should take mode changes into account now.
Signed-off-by: N Junio C Hamano <junkio@cox.net>
43342941 · Junio C Hamano · 01618a3a · 43342941
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

builtin-diff.c builtin-diff.c +1 -1

未找到文件。
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -32,7 +32,7 @@ static void stuff_change(struct diff_options *opt,
 	struct diff_filespec *one, *two;

 	if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
-	    !hashcmp(old_sha1, new_sha1))
+	    !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
 		return;

 	if (opt->reverse_diff) {