X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-cache.c;h=c604359401447e77244ad9b1938eb86bd4198e3a;hb=d6db01075b65da2b8584a0450619390893aae103;hp=a5deb8c7a4c66a21cf5e72681e0f5fd582f7a66d;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index a5deb8c7..c6043594 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -8,7 +8,7 @@ static int line_termination = '\n';
 static int detect_rename = 0;
 static int reverse_diff = 0;
 static int diff_score_opt = 0;
-static char *pickaxe = 0;
+static const char *pickaxe = NULL;
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@ -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);