[PATCH] -w support for git-ssh-pull/push

diff --git a/diff-cache.c b/diff-cache.c
index d573459ba4633775ece269594d277202a9cff2ff..e95fd70da83640d821adb89e97c6fc8b24d649da 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -5,9 +5,12 @@ 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 reverse_diff = 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;
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@ -154,7 +157,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> [<path>...]";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]";
 
 int main(int argc, const char **argv)
 {
@@ -187,14 +190,21 @@ int main(int argc, const char **argv)
                        diff_output_format = DIFF_FORMAT_PATCH;
                        continue;
                }
+               if (!strncmp(arg, "-B", 2)) {
+                       if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
+                       continue;
+               }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
                        continue;
                }
                if (!strncmp(arg, "-C", 2)) {
                        detect_rename = DIFF_DETECT_COPY;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
                        continue;
                }
                if (!strcmp(arg, "-z")) {
@@ -202,13 +212,21 @@ int main(int argc, const char **argv)
                        continue;
                }
                if (!strcmp(arg, "-R")) {
-                       reverse_diff = 1;
+                       diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
                }
-               if (!strcmp(arg, "-S")) {
+               if (!strncmp(arg, "-S", 2)) {
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strncmp(arg, "-O", 2)) {
+                       orderfile = arg + 2;
+                       continue;
+               }
+               if (!strcmp(arg, "--pickaxe-all")) {
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
+                       continue;
+               }
                if (!strcmp(arg, "-m")) {
                        match_nonexisting = 1;
                        continue;
@@ -224,7 +242,7 @@ int main(int argc, const char **argv)
                usage(diff_cache_usage);
 
        /* The rest is for paths restriction. */
-       diff_setup(reverse_diff);
+       diff_setup(diff_setup_opt);
 
        mark_merge_entries();
 
@@ -235,12 +253,12 @@ int main(int argc, const char **argv)
                die("unable to read tree object %s", tree_name);
 
        ret = diff_cache(active_cache, active_nr);
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
-       if (pathspec)
-               diffcore_pathspec(pathspec);
+
+       diffcore_std(pathspec ? : NULL,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts,
+                    diff_break_opt,
+                    orderfile);
        diff_flush(diff_output_format, 1);
        return ret;
 }