summaryrefslogtreecommitdiff
path: root/diff-tree.c
blob: 7015b06c7f13dd71b7b557bd1c903065add33714 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
#include "cache.h"
#include "diff.h"
#include "commit.h"
#include "log-tree.h"
 
static struct log_tree_opt log_tree_opt;
 
static int diff_tree_commit_sha1(const unsigned char *sha1)
{
	struct commit *commit = lookup_commit_reference(sha1);
	if (!commit)
		return -1;
	return log_tree_commit(&log_tree_opt, commit);
}
 
static int diff_tree_stdin(char *line)
{
	int len = strlen(line);
	unsigned char sha1[20];
	struct commit *commit;
 
	if (!len || line[len-1] != '\n')
		return -1;
	line[len-1] = 0;
	if (get_sha1_hex(line, sha1))
		return -1;
	commit = lookup_commit(sha1);
	if (!commit || parse_commit(commit))
		return -1;
	if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
		/* Graft the fake parents locally to the commit */
		int pos = 41;
		struct commit_list **pptr, *parents;
 
		/* Free the real parent list */
		for (parents = commit->parents; parents; ) {
			struct commit_list *tmp = parents->next;
			free(parents);
			parents = tmp;
		}
		commit->parents = NULL;
		pptr = &(commit->parents);
		while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
			struct commit *parent = lookup_commit(sha1);
			if (parent) {
				pptr = &commit_list_insert(parent, pptr)->next;
			}
			pos += 41;
		}
	}
	return log_tree_commit(&log_tree_opt, commit);
}
 
static const char diff_tree_usage[] =
"git-diff-tree [--stdin] [-m] [-c] [--cc] [-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)
{
	int nr_sha1;
	char line[1000];
	unsigned char sha1[2][20];
	const char *prefix = setup_git_directory();
	static struct log_tree_opt *opt = &log_tree_opt;
	int read_stdin = 0;
 
	git_config(git_diff_config);
	nr_sha1 = 0;
	init_log_tree_opt(opt);
 
	for (;;) {
		int opt_cnt;
		const char *arg;
 
		argv++;
		argc--;
		arg = *argv;
		if (!arg)
			break;
 
		if (*arg != '-') {
			if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
				nr_sha1++;
				continue;
			}
			break;
		}
 
		opt_cnt = log_tree_opt_parse(opt, argv, argc);
		if (opt_cnt < 0)
			usage(diff_tree_usage);
		else if (opt_cnt) {
			argv += opt_cnt - 1;
			argc -= opt_cnt - 1;
			continue;
		}
 
		if (!strcmp(arg, "--")) {
			argv++;
			argc--;
			break;
		}
		if (!strcmp(arg, "--stdin")) {
			read_stdin = 1;
			continue;
		}
		usage(diff_tree_usage);
	}
 
	if (opt->combine_merges)
		opt->ignore_merges = 0;
 
	/* We can only do dense combined merges with diff output */
	if (opt->dense_combined_merges)
		opt->diffopt.output_format = DIFF_FORMAT_PATCH;
 
	if (opt->diffopt.output_format == DIFF_FORMAT_PATCH)
		opt->diffopt.recursive = 1;
 
	diff_tree_setup_paths(get_pathspec(prefix, argv), &opt->diffopt);
	diff_setup_done(&opt->diffopt);
 
	switch (nr_sha1) {
	case 0:
		if (!read_stdin)
			usage(diff_tree_usage);
		break;
	case 1:
		diff_tree_commit_sha1(sha1[0]);
		break;
	case 2:
		diff_tree_sha1(sha1[0], sha1[1], "", &opt->diffopt);
		log_tree_diff_flush(opt);
		break;
	}
 
	if (!read_stdin)
		return 0;
 
	if (opt->diffopt.detect_rename)
		opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
				       DIFF_SETUP_USE_CACHE);
	while (fgets(line, sizeof(line), stdin))
		diff_tree_stdin(line);
 
	return 0;
}