summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01618a3)
raw | patch | inline | side by side (parent: 01618a3)
author | Junio C Hamano <junkio@cox.net> | |
Mon, 23 Apr 2007 06:56:22 +0000 (23:56 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 24 Apr 2007 07:08:49 +0000 (00:08 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-diff.c | patch | blob | history |
diff --git a/builtin-diff.c b/builtin-diff.c
index 4ba4d18f871122e0585ead1d09deb728ff518174..7f367b6b9d545ea760224fdacb68056261ce1617 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
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) {