summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-23 06:56:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-24 07:08:49 (GMT)
commit43342941dd736fe06fe607a1594422cc8ba461a1 (patch)
tree41a039911225fcfad05a4d3e672375865d27b835 /builtin-diff.c
parent01618a3ab131548582f4e2371b9b5e7328f61e4a (diff)
downloadgit-43342941dd736fe06fe607a1594422cc8ba461a1.zip
git-43342941dd736fe06fe607a1594422cc8ba461a1.tar.gz
git-43342941dd736fe06fe607a1594422cc8ba461a1.tar.bz2
Diff between two blobs should take mode changes into account now.
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 4ba4d18..7f367b6 100644
--- 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) {