diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-22 23:56:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:49 -0700 |
| commit | 43342941dd736fe06fe607a1594422cc8ba461a1 (patch) | |
| tree | 41a039911225fcfad05a4d3e672375865d27b835 | |
| parent | 01618a3ab131548582f4e2371b9b5e7328f61e4a (diff) | |
| download | git-43342941dd736fe06fe607a1594422cc8ba461a1.tar.gz | |
Diff between two blobs should take mode changes into account now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |