X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-files.c;h=6dca9e0e2b58728f4f13c899a513fbd3fb766808;hb=d6db01075b65da2b8584a0450619390893aae103;hp=d3b80a07255511097fd0eebe94fc844f63d5e152;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git

diff --git a/diff-files.c b/diff-files.c
index d3b80a07..6dca9e0e 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -14,7 +14,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;
 static int silent = 0;
 
 static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
 			continue;
 		}
 		changed = ce_match_stat(ce, &st);
-		if (!changed)
+		if (!changed && detect_rename < 2)
 			continue;
 
 		oldmode = ntohl(ce->ce_mode);