Merge refs/heads/master from .

diff --git a/diff-tree.c b/diff-tree.c
index 6c98e62ad00962858e235f2a4299a530c2afdaf6..fc87902a3d2e6a53a619d603993a73893d4a4ae8 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -9,14 +9,17 @@ 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 diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 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;
 static const char *header = NULL;
 static const char *header_prefix = "";
 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
@@ -115,7 +118,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
                show_file("+", tree2, size2, base);
                return 1;
        }
-       if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
+       if (!find_copies_harder && !memcmp(sha1, sha2, 20) && mode1 == mode2)
                return 0;
 
        /*
@@ -267,24 +270,21 @@ static void call_diff_setup(void)
 
 static int call_diff_flush(void)
 {
-       diffcore_std(0,
+       diffcore_std(NULL,
                     detect_rename, diff_score_opt,
                     pickaxe, pickaxe_opts,
                     diff_break_opt,
-                    orderfile);
+                    orderfile,
+                    diff_filter);
        if (diff_queue_is_empty()) {
-               diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
+               diff_flush(DIFF_FORMAT_NO_OUTPUT, diff_line_termination);
                return 0;
        }
        if (header) {
-               const char *fmt = "%s";
-               if (diff_output_format == DIFF_FORMAT_MACHINE)
-                       fmt = "%s%c";
-               
-               printf(fmt, header, 0);
+               printf("%s%c", header, diff_line_termination);
                header = NULL;
        }
-       diff_flush(diff_output_format, 1);
+       diff_flush(diff_output_format, diff_line_termination);
        return 1;
 }
 
@@ -315,18 +315,16 @@ static int diff_root_tree(const unsigned char *new, const char *base)
        return retval;
 }
 
-static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
+static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
 {
        static char this_header[16384];
        int offset;
 
-       offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
-       if (verbose_header) {
-               offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
-               this_header[offset++] = '\n';
-               this_header[offset++] = 0;
-       }
+       if (!verbose_header)
+               return commit;
 
+       offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
+       offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
        return this_header;
 }
 
@@ -397,27 +395,25 @@ static int diff_tree_stdin(char *line)
        return diff_tree_commit(commit, line);
 }
 
-static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [--pretty] [-t] <tree-ish> <tree-ish>";
-
-static enum cmit_fmt get_commit_format(const char *arg)
+static int count_paths(const char **paths)
 {
-       if (!*arg)
-               return CMIT_FMT_DEFAULT;
-       if (!strcmp(arg, "=raw"))
-               return CMIT_FMT_RAW;
-       if (!strcmp(arg, "=medium"))
-               return CMIT_FMT_MEDIUM;
-       if (!strcmp(arg, "=short"))
-               return CMIT_FMT_SHORT;
-       usage(diff_tree_usage);
+       int i = 0;
+       while (*paths++)
+               i++;
+       return i;
 }
 
-int main(int argc, const char **argv)
+static const char diff_tree_usage[] =
+"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
+"[<common diff options>] <tree-ish> <tree-ish>"
+COMMON_DIFF_OPTIONS_HELP;
+
+int main(int argc, char **argv)
 {
        int nr_sha1;
        char line[1000];
        unsigned char sha1[2][20];
+       const char *prefix = setup_git_directory();
 
        nr_sha1 = 0;
        for (;;) {
@@ -454,7 +450,7 @@ int main(int argc, const char **argv)
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
                }
-               if (!strcmp(arg, "-p")) {
+               if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
                        diff_output_format = DIFF_FORMAT_PATCH;
                        recursive = 1;
                        continue;
@@ -467,6 +463,10 @@ int main(int argc, const char **argv)
                        orderfile = arg + 2;
                        continue;
                }
+               if (!strncmp(arg, "--diff-filter=", 14)) {
+                       diff_filter = arg + 14;
+                       continue;
+               }
                if (!strcmp(arg, "--pickaxe-all")) {
                        pickaxe_opts = DIFF_PICKAXE_ALL;
                        continue;
@@ -488,8 +488,16 @@ int main(int argc, const char **argv)
                                usage(diff_tree_usage);
                        continue;
                }
+               if (!strcmp(arg, "--find-copies-harder")) {
+                       find_copies_harder = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--name-only")) {
+                       diff_output_format = DIFF_FORMAT_NAME;
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
-                       diff_output_format = DIFF_FORMAT_MACHINE;
+                       diff_line_termination = 0;
                        continue;
                }
                if (!strcmp(arg, "-m")) {
@@ -521,12 +529,14 @@ int main(int argc, const char **argv)
                }
                usage(diff_tree_usage);
        }
+       if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
+               usage(diff_tree_usage);
 
-       if (argc > 0) {
+       paths = get_pathspec(prefix, argv);
+       if (paths) {
                int i;
 
-               paths = argv;
-               nr_paths = argc;
+               nr_paths = count_paths(paths);
                pathlens = xmalloc(nr_paths * sizeof(int));
                for (i=0; i<nr_paths; i++)
                        pathlens[i] = strlen(paths[i]);