[PATCH] git: git-commit-script ignores $GIT_DIR

diff --git a/diff-tree.c b/diff-tree.c
index 266528a143af6dfb3ae2e05de6c030872304ff9f..ec2c078170b4323bdd1ba188addbe89c2528c79f 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -6,12 +6,16 @@ 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;
-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;
 static const char *header = NULL;
 static const char *header_prefix = "";
 
@@ -123,6 +127,8 @@ 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;
@@ -252,34 +258,26 @@ 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_setup(diff_setup_opt);
 }
 
 static int call_diff_flush(void)
 {
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
+       diffcore_std(0,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts,
+                    diff_break_opt,
+                    orderfile);
        if (diff_queue_is_empty()) {
                diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
                return 0;
        }
-       if (nr_paths)
-               diffcore_pathspec(paths);
        if (header) {
-               if (diff_output_format == DIFF_FORMAT_MACHINE) {
-                       const char *ep, *cp;
-                       for (cp = header; *cp; cp = ep) {
-                               ep = strchr(cp, '\n');
-                               if (ep == 0) ep = cp + strlen(cp);
-                               printf("%.*s%c", ep-cp, cp, 0);
-                               if (*ep) ep++;
-                       }
-               }
-               else {
-                       printf("%s", 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);
@@ -463,7 +461,7 @@ 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, const char **argv)
 {
@@ -498,8 +496,12 @@ int main(int argc, const char **argv)
                        recursive = 1;
                        continue;
                }
+               if (!strcmp(arg, "-t")) {
+                       recursive = show_tree_entry_in_recursive = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-R")) {
-                       reverse_diff = 1;
+                       diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
                }
                if (!strcmp(arg, "-p")) {
@@ -511,6 +513,14 @@ int main(int argc, const char **argv)
                        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 (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
                        diff_score_opt = diff_scoreopt_parse(arg);
@@ -521,6 +531,10 @@ int main(int argc, const char **argv)
                        diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
+               if (!strncmp(arg, "-B", 2)) {
+                       diff_break_opt = diff_scoreopt_parse(arg);
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        diff_output_format = DIFF_FORMAT_MACHINE;
                        continue;
@@ -575,6 +589,9 @@ int main(int argc, const char **argv)
        if (!read_stdin)
                return 0;
 
+       if (detect_rename)
+               diff_setup_opt |= (DIFF_SETUP_USE_SIZE_CACHE |
+                                  DIFF_SETUP_USE_CACHE);
        while (fgets(line, sizeof(line), stdin))
                diff_tree_stdin(line);