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;
12 /* A file entry went away or appeared */
13 static void show_file(const char *prefix
, struct cache_entry
*ce
, unsigned char *sha1
, unsigned int mode
)
15 diff_addremove(prefix
[0], ntohl(mode
), sha1
, ce
->name
, NULL
);
18 static int get_stat_data(struct cache_entry
*ce
, unsigned char **sha1p
, unsigned int *modep
)
20 unsigned char *sha1
= ce
->sha1
;
21 unsigned int mode
= ce
->ce_mode
;
24 static unsigned char no_sha1
[20];
27 if (lstat(ce
->name
, &st
) < 0) {
28 if (errno
== ENOENT
&& match_nonexisting
) {
35 changed
= ce_match_stat(ce
, &st
);
37 mode
= create_ce_mode(st
.st_mode
);
47 static void show_new_file(struct cache_entry
*new)
52 /* New file in the index: it might actually be different in the working copy */
53 if (get_stat_data(new, &sha1
, &mode
) < 0)
56 show_file("+", new, sha1
, mode
);
59 static int show_modified(struct cache_entry
*old
,
60 struct cache_entry
*new,
63 unsigned int mode
, oldmode
;
66 if (get_stat_data(new, &sha1
, &mode
) < 0) {
68 show_file("-", old
, old
->sha1
, old
->ce_mode
);
72 oldmode
= old
->ce_mode
;
73 if (mode
== oldmode
&& !memcmp(sha1
, old
->sha1
, 20))
77 oldmode
= ntohl(oldmode
);
79 diff_change(oldmode
, mode
,
80 old
->sha1
, sha1
, old
->name
, NULL
);
84 static int diff_cache(struct cache_entry
**ac
, int entries
)
87 struct cache_entry
*ce
= *ac
;
88 int same
= (entries
> 1) && ce_same_name(ce
, ac
[1]);
90 switch (ce_stage(ce
)) {
92 /* No stage 1 entry? That means it's a new file */
97 /* Show difference between old and new */
98 show_modified(ac
[1], ce
, 1);
101 /* No stage 3 (merge) entry? That means it's been deleted */
103 show_file("-", ce
, ce
->sha1
, ce
->ce_mode
);
106 /* We come here with ce pointing at stage 1
107 * (original tree) and ac[1] pointing at stage
108 * 3 (unmerged). show-modified with
109 * report-mising set to false does not say the
110 * file is deleted but reports true if work
111 * tree does not have it, in which case we
112 * fall through to report the unmerged state.
113 * Otherwise, we show the differences between
114 * the original tree and the work tree.
116 if (!cached_only
&& !show_modified(ce
, ac
[1], 0))
120 diff_unmerge(ce
->name
);
124 die("impossible cache entry stage");
128 * Ignore all the different stages for this file,
129 * we've handled the relevant cases now.
134 } while (entries
&& ce_same_name(ce
, ac
[0]));
140 * This turns all merge entries into "stage 3". That guarantees that
141 * when we read in the new tree (into "stage 1"), we won't lose sight
142 * of the fact that we had unmerged entries.
144 static void mark_merge_entries(void)
147 for (i
= 0; i
< active_nr
; i
++) {
148 struct cache_entry
*ce
= active_cache
[i
];
151 ce
->ce_flags
|= htons(CE_STAGEMASK
);
155 static char *diff_cache_usage
=
156 "git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [--cached] <tree-ish>";
158 int main(int argc
, char **argv
)
160 unsigned char tree_sha1
[20];
170 if (!strcmp(arg
, "-r")) {
171 /* We accept the -r flag just to look like git-diff-tree */
174 if (!strcmp(arg
, "-p")) {
178 if (!strncmp(arg
, "-M", 2)) {
179 generate_patch
= detect_rename
= 1;
180 diff_score_opt
= diff_scoreopt_parse(arg
);
183 if (!strncmp(arg
, "-C", 2)) {
186 diff_score_opt
= diff_scoreopt_parse(arg
);
189 if (!strcmp(arg
, "-z")) {
190 line_termination
= '\0';
193 if (!strcmp(arg
, "-R")) {
197 if (!strcmp(arg
, "-m")) {
198 match_nonexisting
= 1;
201 if (!strcmp(arg
, "--cached")) {
205 usage(diff_cache_usage
);
208 if (argc
!= 2 || get_sha1(argv
[1], tree_sha1
))
209 usage(diff_cache_usage
);
211 diff_setup(detect_rename
, diff_score_opt
, reverse_diff
,
212 (generate_patch
? -1 : line_termination
),
215 mark_merge_entries();
217 tree
= read_object_with_reference(tree_sha1
, "tree", &size
, NULL
);
219 die("bad tree object %s", argv
[1]);
220 if (read_tree(tree
, size
, 1))
221 die("unable to read tree object %s", argv
[1]);
223 ret
= diff_cache(active_cache
, active_nr
);