[PATCH] Diff overhaul, adding the other half of copy detection.

diff --git a/diff-cache.c b/diff-cache.c
index a5deb8c7a4c66a21cf5e72681e0f5fd582f7a66d..b47b45a40d277a1211e56de0adfb6753ec34fb02 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -71,7 +71,8 @@ static int show_modified(struct cache_entry *old,
        }
 
        oldmode = old->ce_mode;
-       if (mode == oldmode && !memcmp(sha1, old->sha1, 20))
+       if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
+           detect_rename < 2)
                return 0;
 
        mode = ntohl(mode);