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 static int diff_tree_stdin(char *line
)
19 int len
= strlen(line
);
20 unsigned char sha1
[20];
21 struct commit
*commit
;
23 if (!len
|| line
[len
-1] != '\n')
26 if (get_sha1_hex(line
, sha1
))
28 commit
= lookup_commit(sha1
);
29 if (!commit
|| parse_commit(commit
))
31 if (isspace(line
[40]) && !get_sha1_hex(line
+41, sha1
)) {
32 /* Graft the fake parents locally to the commit */
34 struct commit_list
**pptr
, *parents
;
36 /* Free the real parent list */
37 for (parents
= commit
->parents
; parents
; ) {
38 struct commit_list
*tmp
= parents
->next
;
42 commit
->parents
= NULL
;
43 pptr
= &(commit
->parents
);
44 while (line
[pos
] && !get_sha1_hex(line
+ pos
, sha1
)) {
45 struct commit
*parent
= lookup_commit(sha1
);
47 pptr
= &commit_list_insert(parent
, pptr
)->next
;
52 return log_tree_commit(&log_tree_opt
, commit
);
55 static const char diff_tree_usage
[] =
56 "git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
57 "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
58 " -r diff recursively\n"
59 " --root include the initial commit as diff against /dev/null\n"
60 COMMON_DIFF_OPTIONS_HELP
;
62 int cmd_diff_tree(int argc
, const char **argv
, char **envp
)
66 struct object
*tree1
, *tree2
;
67 static struct rev_info
*opt
= &log_tree_opt
;
68 struct object_list
*list
;
71 git_config(git_diff_config
);
76 argc
= setup_revisions(argc
, argv
, opt
, NULL
);
79 const char *arg
= *++argv
;
81 if (!strcmp(arg
, "--stdin")) {
85 usage(diff_tree_usage
);
89 * NOTE! "setup_revisions()" will have inserted the revisions
90 * it parsed in reverse order. So if you do
94 * the commit list will be "b" -> "a" -> NULL, so we reverse
95 * the order of the objects if the first one is not marked
99 list
= opt
->pending_objects
;
109 usage(diff_tree_usage
);
110 /* Switch them around if the second one was uninteresting.. */
111 if (tree2
->flags
& UNINTERESTING
) {
112 struct object
*tmp
= tree2
;
122 usage(diff_tree_usage
);
125 diff_tree_commit_sha1(tree1
->sha1
);
128 diff_tree_sha1(tree1
->sha1
,
131 log_tree_diff_flush(opt
);
138 if (opt
->diffopt
.detect_rename
)
139 opt
->diffopt
.setup
|= (DIFF_SETUP_USE_SIZE_CACHE
|
140 DIFF_SETUP_USE_CACHE
);
141 while (fgets(line
, sizeof(line
), stdin
))
145 diff_tree_stdin(line
);