[PATCH] clone-pack: Typofix in the error message.

diff --git a/diff-cache.c b/diff-cache.c
index 1d355aa028f2521e8da5b77d14f35bd26eaaa3e4..c435844a255f492aa7ae367239154c3306b77194 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -5,12 +5,14 @@ static int cached_only = 0;
 static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int match_nonexisting = 0;
 static int detect_rename = 0;
+static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
 static int pickaxe_opts = 0;
 static int diff_break_opt = -1;
 static const char *orderfile = NULL;
+static const char *diff_filter = 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)
@@ -74,7 +76,7 @@ static int show_modified(struct cache_entry *old,
 
        oldmode = old->ce_mode;
        if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
-           detect_rename < DIFF_DETECT_COPY)
+           !find_copies_harder)
                return 0;
 
        mode = ntohl(mode);
@@ -157,7 +159,9 @@ static void mark_merge_entries(void)
 }
 
 static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]";
+"git-diff-cache [-m] [--cached] "
+"[<common diff options>] <tree-ish> [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
 {
@@ -191,7 +195,8 @@ int main(int argc, const char **argv)
                        /* We accept the -r flag just to look like git-diff-tree */
                        continue;
                }
-               if (!strcmp(arg, "-p")) {
+               /* We accept the -u flag as a synonym for "-p" */
+               if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
                        diff_output_format = DIFF_FORMAT_PATCH;
                        continue;
                }
@@ -212,10 +217,22 @@ int main(int argc, const char **argv)
                                usage(diff_cache_usage);
                        continue;
                }
+               if (!strcmp(arg, "--find-copies-harder")) {
+                       find_copies_harder = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        diff_output_format = DIFF_FORMAT_MACHINE;
                        continue;
                }
+               if (!strcmp(arg, "--name-only")) {
+                       diff_output_format = DIFF_FORMAT_NAME;
+                       continue;
+               }
+               if (!strcmp(arg, "--name-only-z")) {
+                       diff_output_format = DIFF_FORMAT_NAME_Z;
+                       continue;
+               }
                if (!strcmp(arg, "-R")) {
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
@@ -224,6 +241,10 @@ int main(int argc, const char **argv)
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strncmp(arg, "--diff-filter=", 14)) {
+                       diff_filter = arg + 14;
+                       continue;
+               }
                if (!strncmp(arg, "-O", 2)) {
                        orderfile = arg + 2;
                        continue;
@@ -243,6 +264,9 @@ int main(int argc, const char **argv)
                usage(diff_cache_usage);
        }
 
+       if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
+               usage(diff_cache_usage);
+
        if (!tree_name || get_sha1(tree_name, sha1))
                usage(diff_cache_usage);
 
@@ -263,7 +287,7 @@ int main(int argc, const char **argv)
                     detect_rename, diff_score_opt,
                     pickaxe, pickaxe_opts,
                     diff_break_opt,
-                    orderfile);
-       diff_flush(diff_output_format, 1);
+                    orderfile, diff_filter);
+       diff_flush(diff_output_format);
        return ret;
 }