5 static int show_root_diff = 0;
6 static int no_commit_id = 0;
7 static int verbose_header = 0;
8 static int ignore_merges = 1;
9 static int combine_merges = 0;
10 static int dense_combined_merges = 0;
11 static int read_stdin = 0;
12 static int always_show_header = 0;
14 static const char *header = NULL;
15 static const char *header_prefix = "";
16 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
18 static struct diff_options diff_options;
20 static int call_diff_flush(void)
22 diffcore_std(&diff_options);
23 if (diff_queue_is_empty()) {
24 int saved_fmt = diff_options.output_format;
25 diff_options.output_format = DIFF_FORMAT_NO_OUTPUT;
26 diff_flush(&diff_options);
27 diff_options.output_format = saved_fmt;
32 printf("%s%c", header, diff_options.line_termination);
35 diff_flush(&diff_options);
39 static int diff_tree_sha1_top(const unsigned char *old,
40 const unsigned char *new, const char *base)
44 ret = diff_tree_sha1(old, new, base, &diff_options);
49 static int diff_root_tree(const unsigned char *new, const char *base)
53 struct tree_desc empty, real;
55 tree = read_object_with_reference(new, "tree", &real.size, NULL);
57 die("unable to read root tree (%s)", sha1_to_hex(new));
62 retval = diff_tree(&empty, &real, base, &diff_options);
68 static const char *generate_header(const unsigned char *commit_sha1,
69 const unsigned char *parent_sha1,
70 const struct commit *commit)
72 static char this_header[16384];
75 int abbrev = diff_options.abbrev;
76 const char *msg = commit->buffer;
79 return sha1_to_hex(commit_sha1);
83 offset = sprintf(this_header, "%s%s ",
85 diff_unique_abbrev(commit_sha1, abbrev));
86 if (commit_sha1 != parent_sha1)
87 offset += sprintf(this_header + offset, "(from %s)\n",
89 ? diff_unique_abbrev(parent_sha1, abbrev)
92 offset += sprintf(this_header + offset, "(from parents)\n");
93 offset += pretty_print_commit(commit_format, commit, len,
95 sizeof(this_header) - offset, abbrev);
96 if (always_show_header) {
103 static int diff_tree_commit(struct commit *commit)
105 struct commit_list *parents;
106 unsigned const char *sha1 = commit->object.sha1;
109 if (show_root_diff && !commit->parents) {
110 header = generate_header(sha1, NULL, commit);
111 diff_root_tree(sha1, "");
114 /* More than one parent? */
115 if (commit->parents && commit->parents->next) {
118 else if (combine_merges) {
119 header = generate_header(sha1, sha1, commit);
120 return diff_tree_combined_merge(sha1, header,
121 dense_combined_merges);
125 for (parents = commit->parents; parents; parents = parents->next) {
126 struct commit *parent = parents->item;
127 header = generate_header(sha1, parent->object.sha1, commit);
128 diff_tree_sha1_top(parent->object.sha1, sha1, "");
129 if (!header && verbose_header) {
130 header_prefix = "\ndiff-tree ";
132 * Don't print multiple merge entries if we
133 * don't print the diffs.
140 static int diff_tree_commit_sha1(const unsigned char *sha1)
142 struct commit *commit = lookup_commit_reference(sha1);
145 return diff_tree_commit(commit);
148 static int diff_tree_stdin(char *line)
150 int len = strlen(line);
151 unsigned char sha1[20];
152 struct commit *commit;
154 if (!len || line[len-1] != '\n')
157 if (get_sha1_hex(line, sha1))
159 commit = lookup_commit(sha1);
160 if (!commit || parse_commit(commit))
162 if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
163 /* Graft the fake parents locally to the commit */
165 struct commit_list **pptr, *parents;
167 /* Free the real parent list */
168 for (parents = commit->parents; parents; ) {
169 struct commit_list *tmp = parents->next;
173 commit->parents = NULL;
174 pptr = &(commit->parents);
175 while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
176 struct commit *parent = lookup_commit(sha1);
178 pptr = &commit_list_insert(parent, pptr)->next;
183 return diff_tree_commit(commit);
186 static const char diff_tree_usage[] =
187 "git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
188 "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
189 " -r diff recursively\n"
190 " --root include the initial commit as diff against /dev/null\n"
191 COMMON_DIFF_OPTIONS_HELP;
193 int main(int argc, const char **argv)
197 unsigned char sha1[2][20];
198 const char *prefix = setup_git_directory();
200 git_config(git_diff_config);
202 diff_setup(&diff_options);
215 if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
222 diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc);
223 if (diff_opt_cnt < 0)
224 usage(diff_tree_usage);
225 else if (diff_opt_cnt) {
226 argv += diff_opt_cnt - 1;
227 argc -= diff_opt_cnt - 1;
232 if (!strcmp(arg, "--")) {
237 if (!strcmp(arg, "-r")) {
238 diff_options.recursive = 1;
241 if (!strcmp(arg, "-t")) {
242 diff_options.recursive = 1;
243 diff_options.tree_in_recursive = 1;
246 if (!strcmp(arg, "-m")) {
250 if (!strcmp(arg, "-c")) {
254 if (!strcmp(arg, "--cc")) {
255 dense_combined_merges = combine_merges = 1;
258 if (!strcmp(arg, "-v")) {
260 header_prefix = "diff-tree ";
263 if (!strncmp(arg, "--pretty", 8)) {
265 header_prefix = "diff-tree ";
266 commit_format = get_commit_format(arg+8);
269 if (!strcmp(arg, "--stdin")) {
273 if (!strcmp(arg, "--root")) {
277 if (!strcmp(arg, "--no-commit-id")) {
281 if (!strcmp(arg, "--always")) {
282 always_show_header = 1;
285 usage(diff_tree_usage);
287 if (diff_options.output_format == DIFF_FORMAT_PATCH)
288 diff_options.recursive = 1;
290 if (combine_merges) {
291 diff_options.output_format = DIFF_FORMAT_PATCH;
295 diff_tree_setup_paths(get_pathspec(prefix, argv));
296 diff_setup_done(&diff_options);
301 usage(diff_tree_usage);
304 diff_tree_commit_sha1(sha1[0]);
307 diff_tree_sha1_top(sha1[0], sha1[1], "");
314 if (diff_options.detect_rename)
315 diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
316 DIFF_SETUP_USE_CACHE);
317 while (fgets(line, sizeof(line), stdin))
318 diff_tree_stdin(line);