9 static struct rev_info log_tree_opt
;
11 static int diff_tree_commit_oid(const struct object_id
*oid
)
13 struct commit
*commit
= lookup_commit_reference(oid
);
16 return log_tree_commit(&log_tree_opt
, commit
);
19 /* Diff one or more commits. */
20 static int stdin_diff_commit(struct commit
*commit
, const char *p
)
23 struct commit_list
**pptr
= NULL
;
25 /* Graft the fake parents locally to the commit */
26 while (isspace(*p
++) && !parse_oid_hex(p
, &oid
, &p
)) {
27 struct commit
*parent
= lookup_commit(&oid
);
29 /* Free the real parent list */
30 free_commit_list(commit
->parents
);
31 commit
->parents
= NULL
;
32 pptr
= &(commit
->parents
);
35 pptr
= &commit_list_insert(parent
, pptr
)->next
;
38 return log_tree_commit(&log_tree_opt
, commit
);
42 static int stdin_diff_trees(struct tree
*tree1
, const char *p
)
46 if (!isspace(*p
++) || parse_oid_hex(p
, &oid
, &p
) || *p
)
47 return error("Need exactly two trees, separated by a space");
48 tree2
= lookup_tree(&oid
);
49 if (!tree2
|| parse_tree(tree2
))
51 printf("%s %s\n", oid_to_hex(&tree1
->object
.oid
),
52 oid_to_hex(&tree2
->object
.oid
));
53 diff_tree_oid(&tree1
->object
.oid
, &tree2
->object
.oid
,
54 "", &log_tree_opt
.diffopt
);
55 log_tree_diff_flush(&log_tree_opt
);
59 static int diff_tree_stdin(char *line
)
61 int len
= strlen(line
);
66 if (!len
|| line
[len
-1] != '\n')
69 if (parse_oid_hex(line
, &oid
, &p
))
71 obj
= parse_object(&oid
);
74 if (obj
->type
== OBJ_COMMIT
)
75 return stdin_diff_commit((struct commit
*)obj
, p
);
76 if (obj
->type
== OBJ_TREE
)
77 return stdin_diff_trees((struct tree
*)obj
, p
);
78 error("Object %s is a %s, not a commit or tree",
79 oid_to_hex(&oid
), typename(obj
->type
));
83 static const char diff_tree_usage
[] =
84 "git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
85 "[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
86 " -r diff recursively\n"
87 " --root include the initial commit as diff against /dev/null\n"
88 COMMON_DIFF_OPTIONS_HELP
;
90 static void diff_tree_tweak_rev(struct rev_info
*rev
, struct setup_revision_opt
*opt
)
92 if (!rev
->diffopt
.output_format
) {
93 if (rev
->dense_combined_merges
)
94 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
96 rev
->diffopt
.output_format
= DIFF_FORMAT_RAW
;
100 int cmd_diff_tree(int argc
, const char **argv
, const char *prefix
)
103 struct object
*tree1
, *tree2
;
104 static struct rev_info
*opt
= &log_tree_opt
;
105 struct setup_revision_opt s_r_opt
;
108 if (argc
== 2 && !strcmp(argv
[1], "-h"))
109 usage(diff_tree_usage
);
111 git_config(git_diff_basic_config
, NULL
); /* no "diff" UI options */
112 init_revisions(opt
, prefix
);
116 opt
->disable_stdin
= 1;
117 memset(&s_r_opt
, 0, sizeof(s_r_opt
));
118 s_r_opt
.tweak
= diff_tree_tweak_rev
;
120 precompose_argv(argc
, argv
);
121 argc
= setup_revisions(argc
, argv
, opt
, &s_r_opt
);
124 const char *arg
= *++argv
;
126 if (!strcmp(arg
, "--stdin")) {
130 usage(diff_tree_usage
);
134 * NOTE! We expect "a..b" to expand to "^a b" but it is
135 * perfectly valid for revision range parser to yield "b ^a",
136 * which means the same thing. If we get the latter, i.e. the
137 * second one is marked UNINTERESTING, we recover the original
138 * order the user gave, i.e. "a..b", by swapping the trees.
140 switch (opt
->pending
.nr
) {
143 usage(diff_tree_usage
);
146 tree1
= opt
->pending
.objects
[0].item
;
147 diff_tree_commit_oid(&tree1
->oid
);
150 tree1
= opt
->pending
.objects
[0].item
;
151 tree2
= opt
->pending
.objects
[1].item
;
152 if (tree2
->flags
& UNINTERESTING
) {
155 diff_tree_oid(&tree1
->oid
, &tree2
->oid
, "", &opt
->diffopt
);
156 log_tree_diff_flush(opt
);
164 if (opt
->diffopt
.detect_rename
)
165 opt
->diffopt
.setup
|= (DIFF_SETUP_USE_SIZE_CACHE
|
166 DIFF_SETUP_USE_CACHE
);
167 while (fgets(line
, sizeof(line
), stdin
)) {
168 struct object_id oid
;
170 if (get_oid_hex(line
, &oid
)) {
175 diff_tree_stdin(line
);
176 if (saved_nrl
< opt
->diffopt
.needed_rename_limit
)
177 saved_nrl
= opt
->diffopt
.needed_rename_limit
;
178 if (opt
->diffopt
.degraded_cc_to_c
)
182 opt
->diffopt
.degraded_cc_to_c
= saved_dcctc
;
183 opt
->diffopt
.needed_rename_limit
= saved_nrl
;
186 return diff_result_code(&opt
->diffopt
, 0);