7 static struct rev_info log_tree_opt;
9 static int diff_tree_commit_sha1(const unsigned char *sha1)
11 struct commit *commit = lookup_commit_reference(sha1);
14 return log_tree_commit(&log_tree_opt, commit);
17 /* Diff one or more commits. */
18 static int stdin_diff_commit(struct commit *commit, char *line, int len)
20 unsigned char sha1[20];
21 if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
22 /* Graft the fake parents locally to the commit */
24 struct commit_list **pptr, *parents;
26 /* Free the real parent list */
27 for (parents = commit->parents; parents; ) {
28 struct commit_list *tmp = parents->next;
32 commit->parents = NULL;
33 pptr = &(commit->parents);
34 while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
35 struct commit *parent = lookup_commit(sha1);
37 pptr = &commit_list_insert(parent, pptr)->next;
42 return log_tree_commit(&log_tree_opt, commit);
45 static int diff_tree_stdin(char *line)
47 int len = strlen(line);
48 unsigned char sha1[20];
49 struct commit *commit;
51 if (!len || line[len-1] != '\n')
54 if (get_sha1_hex(line, sha1))
56 commit = lookup_commit(sha1);
57 if (!commit || parse_commit(commit))
59 return stdin_diff_commit(commit, line, len);
62 static const char diff_tree_usage[] =
63 "git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
64 "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
65 " -r diff recursively\n"
66 " --root include the initial commit as diff against /dev/null\n"
67 COMMON_DIFF_OPTIONS_HELP;
69 int cmd_diff_tree(int argc, const char **argv, const char *prefix)
73 struct object *tree1, *tree2;
74 static struct rev_info *opt = &log_tree_opt;
77 init_revisions(opt, prefix);
78 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
82 argc = setup_revisions(argc, argv, opt, NULL);
85 const char *arg = *++argv;
87 if (!strcmp(arg, "--stdin")) {
91 usage(diff_tree_usage);
94 if (!opt->diffopt.output_format)
95 opt->diffopt.output_format = DIFF_FORMAT_RAW;
98 * NOTE! We expect "a ^b" to be equal to "a..b", so we
99 * reverse the order of the objects if the second one
100 * is marked UNINTERESTING.
102 nr_sha1 = opt->pending.nr;
106 usage(diff_tree_usage);
109 tree1 = opt->pending.objects[0].item;
110 diff_tree_commit_sha1(tree1->sha1);
113 tree1 = opt->pending.objects[0].item;
114 tree2 = opt->pending.objects[1].item;
115 if (tree2->flags & UNINTERESTING) {
116 struct object *tmp = tree2;
120 diff_tree_sha1(tree1->sha1,
123 log_tree_diff_flush(opt);
128 if (opt->diffopt.detect_rename)
129 opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
130 DIFF_SETUP_USE_CACHE);
131 while (fgets(line, sizeof(line), stdin)) {
132 unsigned char sha1[20];
134 if (get_sha1_hex(line, sha1)) {
139 diff_tree_stdin(line);
143 return diff_result_code(&opt->diffopt, 0);