4 static int cached_only = 0;
5 static int generate_patch = 0;
6 static int match_nonexisting = 0;
7 static int line_termination = '\n';
8 static int detect_rename = 0;
9 static int reverse_diff = 0;
10 static int diff_score_opt = 0;
11 static char *pickaxe = 0;
13 /* A file entry went away or appeared */
14 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
16 diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
19 static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
21 unsigned char *sha1 = ce->sha1;
22 unsigned int mode = ce->ce_mode;
25 static unsigned char no_sha1[20];
28 if (lstat(ce->name, &st) < 0) {
29 if (errno == ENOENT && match_nonexisting) {
36 changed = ce_match_stat(ce, &st);
38 mode = create_ce_mode(st.st_mode);
48 static void show_new_file(struct cache_entry *new)
53 /* New file in the index: it might actually be different in the working copy */
54 if (get_stat_data(new, &sha1, &mode) < 0)
57 show_file("+", new, sha1, mode);
60 static int show_modified(struct cache_entry *old,
61 struct cache_entry *new,
64 unsigned int mode, oldmode;
67 if (get_stat_data(new, &sha1, &mode) < 0) {
69 show_file("-", old, old->sha1, old->ce_mode);
73 oldmode = old->ce_mode;
74 if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
79 oldmode = ntohl(oldmode);
81 diff_change(oldmode, mode,
82 old->sha1, sha1, old->name, NULL);
86 static int diff_cache(struct cache_entry **ac, int entries)
89 struct cache_entry *ce = *ac;
90 int same = (entries > 1) && ce_same_name(ce, ac[1]);
92 switch (ce_stage(ce)) {
94 /* No stage 1 entry? That means it's a new file */
99 /* Show difference between old and new */
100 show_modified(ac[1], ce, 1);
103 /* No stage 3 (merge) entry? That means it's been deleted */
105 show_file("-", ce, ce->sha1, ce->ce_mode);
108 /* We come here with ce pointing at stage 1
109 * (original tree) and ac[1] pointing at stage
110 * 3 (unmerged). show-modified with
111 * report-mising set to false does not say the
112 * file is deleted but reports true if work
113 * tree does not have it, in which case we
114 * fall through to report the unmerged state.
115 * Otherwise, we show the differences between
116 * the original tree and the work tree.
118 if (!cached_only && !show_modified(ce, ac[1], 0))
122 diff_unmerge(ce->name);
126 die("impossible cache entry stage");
130 * Ignore all the different stages for this file,
131 * we've handled the relevant cases now.
136 } while (entries && ce_same_name(ce, ac[0]));
142 * This turns all merge entries into "stage 3". That guarantees that
143 * when we read in the new tree (into "stage 1"), we won't lose sight
144 * of the fact that we had unmerged entries.
146 static void mark_merge_entries(void)
149 for (i = 0; i < active_nr; i++) {
150 struct cache_entry *ce = active_cache[i];
153 ce->ce_flags |= htons(CE_STAGEMASK);
157 static char *diff_cache_usage =
158 "git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
160 int main(int argc, char **argv)
162 unsigned char tree_sha1[20];
172 if (!strcmp(arg, "-r")) {
173 /* We accept the -r flag just to look like git-diff-tree */
176 if (!strcmp(arg, "-p")) {
180 if (!strncmp(arg, "-M", 2)) {
181 generate_patch = detect_rename = 1;
182 diff_score_opt = diff_scoreopt_parse(arg);
185 if (!strncmp(arg, "-C", 2)) {
188 diff_score_opt = diff_scoreopt_parse(arg);
191 if (!strcmp(arg, "-z")) {
192 line_termination = '\0';
195 if (!strcmp(arg, "-R")) {
199 if (!strcmp(arg, "-S")) {
203 if (!strcmp(arg, "-m")) {
204 match_nonexisting = 1;
207 if (!strcmp(arg, "--cached")) {
211 usage(diff_cache_usage);
214 if (argc != 2 || get_sha1(argv[1], tree_sha1))
215 usage(diff_cache_usage);
217 diff_setup(detect_rename, diff_score_opt, pickaxe,
218 reverse_diff, (generate_patch ? -1 : line_termination),
221 mark_merge_entries();
223 tree = read_object_with_reference(tree_sha1, "tree", &size, NULL);
225 die("bad tree object %s", argv[1]);
226 if (read_tree(tree, size, 1))
227 die("unable to read tree object %s", argv[1]);
229 ret = diff_cache(active_cache, active_nr);