From: Junio C Hamano <junkio@cox.net>
Date: Mon, 23 Apr 2007 06:56:22 +0000 (-0700)
Subject: Diff between two blobs should take mode changes into account now.
X-Git-Tag: v1.5.2-rc1~30^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/43342941dd736fe06fe607a1594422cc8ba461a1?ds=inline;hp=--cc

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

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

43342941dd736fe06fe607a1594422cc8ba461a1
diff --git a/builtin-diff.c b/builtin-diff.c
index 4ba4d18f87..7f367b6b9d 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) {