[PATCH] Redo rename/copy detection logic.

diff --git a/diff-cache.c b/diff-cache.c
index 10d5c955743d5095b114185e06ba6724c5919e3e..744fffb7c8c684e9d0206da36a0fba1c502570c9 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -154,7 +154,7 @@ static void mark_merge_entries(void)
 }
 
 static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
 
 int main(int argc, const char **argv)
 {
@@ -229,7 +229,6 @@ int main(int argc, const char **argv)
        ret = diff_cache(active_cache, active_nr);
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
-       diffcore_prune();
        if (pickaxe)
                diffcore_pickaxe(pickaxe);
        if (2 <= argc)