merge-recursive: cleanup setIndexStages

diff --git a/diff-tree.c b/diff-tree.c
index 382011a2a6d1a701aeb1104991d9abbfcb5b73df..d56d921585d5cd48b88bfbb36bcde016e10f8fd5 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 
 static int show_root_diff = 0;
+static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
 static int read_stdin = 0;
@@ -29,7 +30,8 @@ static int call_diff_flush(void)
                return 0;
        }
        if (header) {
-               printf("%s%c", header, diff_options.line_termination);
+               if (!no_commit_id)
+                       printf("%s%c", header, diff_options.line_termination);
                header = NULL;
        }
        diff_flush(&diff_options);
@@ -67,52 +69,50 @@ static int diff_root_tree(const unsigned char *new, const char *base)
        return retval;
 }
 
-static const 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)
 {
        static char this_header[16384];
        int offset;
+       unsigned long len;
 
        if (!verbose_header)
                return commit;
 
+       len = strlen(msg);
        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;
 }
 
-static int diff_tree_commit(const unsigned char *commit, const char *name)
+static int diff_tree_commit(const unsigned char *commit_sha1)
 {
-       unsigned long size, offset;
-       char *buf = read_object_with_reference(commit, "commit", &size, NULL);
+       struct commit *commit;
+       struct commit_list *parents;
+       char name[50];
+       unsigned char sha1[20];
 
-       if (!buf)
+       sprintf(name, "%s^0", sha1_to_hex(commit_sha1));
+       if (get_sha1(name, sha1))
                return -1;
-
-       if (!name) {
-               static char commit_name[60];
-               strcpy(commit_name, sha1_to_hex(commit));
-               name = commit_name;
-       }
-
+       name[40] = 0;
+       commit = lookup_commit(sha1);
+       
        /* Root commit? */
-       if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
-               header = generate_header(name, "root", buf, size);
-               diff_root_tree(commit, "");
+       if (show_root_diff && !commit->parents) {
+               header = generate_header(name, "root", commit->buffer);
+               diff_root_tree(commit_sha1, "");
        }
 
        /* More than one parent? */
-       if (ignore_merges) {
-               if (!memcmp(buf + 46 + 48, "parent ", 7))
+       if (ignore_merges && commit->parents && commit->parents->next)
                        return 0;
-       }
 
-       offset = 46;
-       while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
-               unsigned char parent[20];
-               if (get_sha1_hex(buf + offset + 7, parent))
-                       return -1;
-               header = generate_header(name, sha1_to_hex(parent), buf, size);
-               diff_tree_sha1_top(parent, commit, "");
+       for (parents = commit->parents; parents; parents = parents->next) {
+               struct commit *parent = parents->item;
+               header = generate_header(name,
+                                        sha1_to_hex(parent->object.sha1),
+                                        commit->buffer);
+               diff_tree_sha1_top(parent->object.sha1, commit_sha1, "");
                if (!header && verbose_header) {
                        header_prefix = "\ndiff-tree ";
                        /*
@@ -120,9 +120,7 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                         * don't print the diffs.
                         */
                }
-               offset += 48;
        }
-       free(buf);
        return 0;
 }
 
@@ -145,12 +143,14 @@ static int diff_tree_stdin(char *line)
                return diff_tree_sha1_top(parent, commit, "");
        }
        line[40] = 0;
-       return diff_tree_commit(commit, line);
+       return diff_tree_commit(commit);
 }
 
 static const char diff_tree_usage[] =
-"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
-"[<common diff options>] <tree-ish> <tree-ish>"
+"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
+"  -r            diff recursively\n"
+"  --root        include the initial commit as diff against /dev/null\n"
 COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
@@ -160,7 +160,7 @@ int main(int argc, const char **argv)
        unsigned char sha1[2][20];
        const char *prefix = setup_git_directory();
 
-       git_config(git_default_config);
+       git_config(git_diff_config);
        nr_sha1 = 0;
        diff_setup(&diff_options);
 
@@ -229,6 +229,10 @@ int main(int argc, const char **argv)
                        show_root_diff = 1;
                        continue;
                }
+               if (!strcmp(arg, "--no-commit-id")) {
+                       no_commit_id = 1;
+                       continue;
+               }
                usage(diff_tree_usage);
        }
        if (diff_options.output_format == DIFF_FORMAT_PATCH)
@@ -242,7 +246,7 @@ int main(int argc, const char **argv)
                        usage(diff_tree_usage);
                break;
        case 1:
-               diff_tree_commit(sha1[0], NULL);
+               diff_tree_commit(sha1[0]);
                break;
        case 2:
                diff_tree_sha1_top(sha1[0], sha1[1], "");