git-diff-tree: simplify header output with '-z'

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 3428a6e..80d02b4 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -2,11 +2,11 @@
 #include "cache.h"
 #include "diff.h"
 
-static int silent = 0;
 static int show_root_diff = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
 static int recursive = 0;
+static int show_tree_entry_in_recursive = 0;
 static int read_stdin = 0;
 static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int detect_rename = 0;
@@ -18,7 +18,7 @@ static const char *header_prefix = "";
 
 // What paths are we interested in?
 static int nr_paths = 0;
-static char **paths = NULL;
+static const char **paths = NULL;
 static int *pathlens = NULL;
 
 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
@@ -67,14 +67,6 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
        const char *path;
        const unsigned char *sha1 = extract(tree, size, &path, &mode);
 
-       if (header) {
-               printf("%s", header);
-               header = NULL;
-       }
-
-       if (silent)
-               return;
-
        if (recursive && S_ISDIR(mode)) {
                char type[20];
                unsigned long size;
@@ -132,18 +124,13 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
        if (recursive && S_ISDIR(mode1)) {
                int retval;
                char *newbase = malloc_base(base, path1, pathlen1);
+               if (show_tree_entry_in_recursive)
+                       diff_change(mode1, mode2, sha1, sha2, base, path1);
                retval = diff_tree_sha1(sha1, sha2, newbase);
                free(newbase);
                return retval;
        }
 
-       if (header) {
-               printf("%s", header);
-               header = NULL;
-       }
-       if (silent)
-               return 0;
-
        diff_change(mode1, mode2, sha1, sha2, base, path1);
        return 0;
 }
@@ -268,16 +255,29 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 
 static void call_diff_setup(void)
 {
-       diff_setup(reverse_diff, diff_output_format);
+       diff_setup(reverse_diff);
 }
 
-static void call_diff_flush(void)
+static int call_diff_flush(void)
 {
        if (detect_rename)
-               diff_detect_rename(detect_rename, diff_score_opt);
+               diffcore_rename(detect_rename, diff_score_opt);
        if (pickaxe)
-               diff_pickaxe(pickaxe);
-       diff_flush(NULL, 0);
+               diffcore_pickaxe(pickaxe);
+       if (diff_queue_is_empty()) {
+               diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
+               return 0;
+       }
+       if (header) {
+               const char *fmt = "%s";
+               if (diff_output_format == DIFF_FORMAT_MACHINE)
+                       fmt = "%s%c";
+               
+               printf(fmt, header, 0);
+               header = NULL;
+       }
+       diff_flush(diff_output_format, 1);
+       return 1;
 }
 
 static int diff_tree_sha1_top(const unsigned char *old,
@@ -382,8 +382,7 @@ static char *generate_header(const char *commit, const char *parent, const char
                if (this_header[offset-1] != '\n')
                        this_header[offset++] = '\n';
                /* Add _another_ EOLN if we are doing diff output */
-               if (!silent)
-                       this_header[offset++] = '\n';
+               this_header[offset++] = '\n';
                this_header[offset] = 0;
        }
 
@@ -429,8 +428,6 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                         * Don't print multiple merge entries if we
                         * don't print the diffs.
                         */
-                       if (silent)
-                               break;
                }
                offset += 48;
        }
@@ -460,9 +457,9 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
        int nr_sha1;
        char line[1000];
@@ -470,7 +467,7 @@ int main(int argc, char **argv)
 
        nr_sha1 = 0;
        for (;;) {
-               char *arg;
+               const char *arg;
 
                argv++;
                argc--;
@@ -495,6 +492,10 @@ int main(int argc, char **argv)
                        recursive = 1;
                        continue;
                }
+               if (!strcmp(arg, "-t")) {
+                       recursive = show_tree_entry_in_recursive = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-R")) {
                        reverse_diff = 1;
                        continue;
@@ -509,12 +510,12 @@ int main(int argc, char **argv)
                        continue;
                }
                if (!strncmp(arg, "-M", 2)) {
-                       detect_rename = 1;
+                       detect_rename = DIFF_DETECT_RENAME;
                        diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
                if (!strncmp(arg, "-C", 2)) {
-                       detect_rename = 2;
+                       detect_rename = DIFF_DETECT_COPY;
                        diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
@@ -527,7 +528,7 @@ int main(int argc, char **argv)
                        continue;
                }
                if (!strcmp(arg, "-s")) {
-                       silent = 1;
+                       diff_output_format = DIFF_FORMAT_NO_OUTPUT;
                        continue;
                }
                if (!strcmp(arg, "-v")) {