4 static int cached_only
= 0;
5 static int diff_output_format
= DIFF_FORMAT_HUMAN
;
6 static int match_nonexisting
= 0;
7 static int detect_rename
= 0;
8 static int diff_setup_opt
= 0;
9 static int diff_score_opt
= 0;
10 static const char *pickaxe
= NULL
;
11 static int pickaxe_opts
= 0;
12 static int diff_break_opt
= -1;
14 /* A file entry went away or appeared */
15 static void show_file(const char *prefix
, struct cache_entry
*ce
, unsigned char *sha1
, unsigned int mode
)
17 diff_addremove(prefix
[0], ntohl(mode
), sha1
, ce
->name
, NULL
);
20 static int get_stat_data(struct cache_entry
*ce
, unsigned char **sha1p
, unsigned int *modep
)
22 unsigned char *sha1
= ce
->sha1
;
23 unsigned int mode
= ce
->ce_mode
;
26 static unsigned char no_sha1
[20];
29 if (lstat(ce
->name
, &st
) < 0) {
30 if (errno
== ENOENT
&& match_nonexisting
) {
37 changed
= ce_match_stat(ce
, &st
);
39 mode
= create_ce_mode(st
.st_mode
);
49 static void show_new_file(struct cache_entry
*new)
54 /* New file in the index: it might actually be different in the working copy */
55 if (get_stat_data(new, &sha1
, &mode
) < 0)
58 show_file("+", new, sha1
, mode
);
61 static int show_modified(struct cache_entry
*old
,
62 struct cache_entry
*new,
65 unsigned int mode
, oldmode
;
68 if (get_stat_data(new, &sha1
, &mode
) < 0) {
70 show_file("-", old
, old
->sha1
, old
->ce_mode
);
74 oldmode
= old
->ce_mode
;
75 if (mode
== oldmode
&& !memcmp(sha1
, old
->sha1
, 20) &&
76 detect_rename
< DIFF_DETECT_COPY
)
80 oldmode
= ntohl(oldmode
);
82 diff_change(oldmode
, mode
,
83 old
->sha1
, sha1
, old
->name
, NULL
);
87 static int diff_cache(struct cache_entry
**ac
, int entries
)
90 struct cache_entry
*ce
= *ac
;
91 int same
= (entries
> 1) && ce_same_name(ce
, ac
[1]);
93 switch (ce_stage(ce
)) {
95 /* No stage 1 entry? That means it's a new file */
100 /* Show difference between old and new */
101 show_modified(ac
[1], ce
, 1);
104 /* No stage 3 (merge) entry? That means it's been deleted */
106 show_file("-", ce
, ce
->sha1
, ce
->ce_mode
);
109 /* We come here with ce pointing at stage 1
110 * (original tree) and ac[1] pointing at stage
111 * 3 (unmerged). show-modified with
112 * report-mising set to false does not say the
113 * file is deleted but reports true if work
114 * tree does not have it, in which case we
115 * fall through to report the unmerged state.
116 * Otherwise, we show the differences between
117 * the original tree and the work tree.
119 if (!cached_only
&& !show_modified(ce
, ac
[1], 0))
123 diff_unmerge(ce
->name
);
127 die("impossible cache entry stage");
131 * Ignore all the different stages for this file,
132 * we've handled the relevant cases now.
137 } while (entries
&& ce_same_name(ce
, ac
[0]));
143 * This turns all merge entries into "stage 3". That guarantees that
144 * when we read in the new tree (into "stage 1"), we won't lose sight
145 * of the fact that we had unmerged entries.
147 static void mark_merge_entries(void)
150 for (i
= 0; i
< active_nr
; i
++) {
151 struct cache_entry
*ce
= active_cache
[i
];
154 ce
->ce_flags
|= htons(CE_STAGEMASK
);
158 static char *diff_cache_usage
=
159 "git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
161 int main(int argc
, const char **argv
)
163 const char *tree_name
= NULL
;
164 unsigned char sha1
[20];
165 const char **pathspec
= NULL
;
172 for (i
= 1; i
< argc
; i
++) {
173 const char *arg
= argv
[i
];
184 if (!strcmp(arg
, "-r")) {
185 /* We accept the -r flag just to look like git-diff-tree */
188 if (!strcmp(arg
, "-p")) {
189 diff_output_format
= DIFF_FORMAT_PATCH
;
192 if (!strncmp(arg
, "-B", 2)) {
193 diff_break_opt
= diff_scoreopt_parse(arg
);
196 if (!strncmp(arg
, "-M", 2)) {
197 detect_rename
= DIFF_DETECT_RENAME
;
198 diff_score_opt
= diff_scoreopt_parse(arg
);
201 if (!strncmp(arg
, "-C", 2)) {
202 detect_rename
= DIFF_DETECT_COPY
;
203 diff_score_opt
= diff_scoreopt_parse(arg
);
206 if (!strcmp(arg
, "-z")) {
207 diff_output_format
= DIFF_FORMAT_MACHINE
;
210 if (!strcmp(arg
, "-R")) {
211 diff_setup_opt
|= DIFF_SETUP_REVERSE
;
214 if (!strncmp(arg
, "-S", 2)) {
218 if (!strcmp(arg
, "--pickaxe-all")) {
219 pickaxe_opts
= DIFF_PICKAXE_ALL
;
222 if (!strcmp(arg
, "-m")) {
223 match_nonexisting
= 1;
226 if (!strcmp(arg
, "--cached")) {
230 usage(diff_cache_usage
);
233 if (!tree_name
|| get_sha1(tree_name
, sha1
))
234 usage(diff_cache_usage
);
236 /* The rest is for paths restriction. */
237 diff_setup(diff_setup_opt
);
239 mark_merge_entries();
241 tree
= read_object_with_reference(sha1
, "tree", &size
, NULL
);
243 die("bad tree object %s", tree_name
);
244 if (read_tree(tree
, size
, 1))
245 die("unable to read tree object %s", tree_name
);
247 ret
= diff_cache(active_cache
, active_nr
);
249 diffcore_std(pathspec
? : NULL
,
250 detect_rename
, diff_score_opt
,
251 pickaxe
, pickaxe_opts
,
253 diff_flush(diff_output_format
, 1);