diff-tree: don't print multiple headers for merges when silent.

[git.git] / diff-cache.c

diff --git a/diff-cache.c b/diff-cache.c
index ff310ab..c604359 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -8,6 +8,7 @@ static int line_termination = '\n';
 static int detect_rename = 0;
 static int reverse_diff = 0;
 static int diff_score_opt = 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)
@@ -70,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);
@@ -153,7 +155,7 @@ static void mark_merge_entries(void)
 }
 
 static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-R] [--cached] <tree-ish>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
 
 int main(int argc, char **argv)
 {
@@ -180,6 +182,12 @@ int main(int argc, char **argv)
                        diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
+               if (!strncmp(arg, "-C", 2)) {
+                       generate_patch = 1;
+                       detect_rename = 2;
+                       diff_score_opt = diff_scoreopt_parse(arg);
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        line_termination = '\0';
                        continue;
@@ -188,6 +196,10 @@ int main(int argc, char **argv)
                        reverse_diff = 1;
                        continue;
                }
+               if (!strcmp(arg, "-S")) {
+                       pickaxe = arg + 2;
+                       continue;
+               }
                if (!strcmp(arg, "-m")) {
                        match_nonexisting = 1;
                        continue;
@@ -202,8 +214,8 @@ int main(int argc, char **argv)
        if (argc != 2 || get_sha1(argv[1], tree_sha1))
                usage(diff_cache_usage);
 
-       diff_setup(detect_rename, diff_score_opt, reverse_diff,
-                  (generate_patch ? -1 : line_termination),
+       diff_setup(detect_rename, diff_score_opt, pickaxe,
+                  reverse_diff, (generate_patch ? -1 : line_termination),
                   NULL, 0);
 
        mark_merge_entries();