3 static int cached_only
= 0;
4 static int line_termination
= '\n';
6 /* A file entry went away or appeared */
7 static void show_file(const char *prefix
, struct cache_entry
*ce
)
9 printf("%s%o\t%s\t%s\t%s%c", prefix
, ntohl(ce
->ce_mode
), "blob",
10 sha1_to_hex(ce
->sha1
), ce
->name
, line_termination
);
13 static int show_modified(struct cache_entry
*old
, struct cache_entry
*new)
15 unsigned int mode
= ntohl(new->ce_mode
), oldmode
;
16 unsigned char *sha1
= new->sha1
;
17 unsigned char old_sha1_hex
[60];
20 static unsigned char no_sha1
[20];
23 if (stat(new->name
, &st
) < 0) {
27 changed
= cache_match_stat(new, &st
);
34 oldmode
= ntohl(old
->ce_mode
);
35 if (mode
== oldmode
&& !memcmp(sha1
, old
->sha1
, 20))
38 strcpy(old_sha1_hex
, sha1_to_hex(old
->sha1
));
39 printf("*%o->%o\t%s\t%s->%s\t%s%c", oldmode
, mode
,
41 old_sha1_hex
, sha1_to_hex(sha1
),
42 old
->name
, line_termination
);
46 static int diff_cache(struct cache_entry
**ac
, int entries
)
49 struct cache_entry
*ce
= *ac
;
51 /* No matching 0-stage (current) entry? Show it as deleted */
58 /* No matching 1-stage (tree) entry? Show the current one as added */
59 if (entries
== 1 || !same_name(ce
, ac
[1])) {
65 show_modified(ac
[1], ce
);
73 static void remove_merge_entries(void)
76 for (i
= 0; i
< active_nr
; i
++) {
77 struct cache_entry
*ce
= active_cache
[i
];
80 printf("%s: unmerged\n", ce
->name
);
81 while (remove_entry_at(i
)) {
82 if (!ce_stage(active_cache
[i
]))
88 static char *diff_cache_usage
= "diff-cache [-r] [-z] [--cached] <tree sha1>";
90 int main(int argc
, char **argv
)
92 unsigned char tree_sha1
[20];
101 if (!strcmp(arg
, "-r")) {
102 /* We accept the -r flag just to look like diff-tree */
105 if (!strcmp(arg
, "-z")) {
106 line_termination
= '\0';
109 if (!strcmp(arg
, "--cached")) {
113 usage(diff_cache_usage
);
116 if (argc
!= 2 || get_sha1_hex(argv
[1], tree_sha1
))
117 usage(diff_cache_usage
);
119 remove_merge_entries();
121 tree
= read_tree_with_tree_or_commit_sha1(tree_sha1
, &size
, 0);
123 die("bad tree object %s", argv
[1]);
124 if (read_tree(tree
, size
, 1))
125 die("unable to read tree object %s", argv
[1]);
127 return diff_cache(active_cache
, active_nr
);