]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
86436c28 | 4 | #include "cache.h" |
6fb737be | 5 | #include "quote.h" |
6973dcae | 6 | #include "commit.h" |
86436c28 | 7 | #include "diff.h" |
427dcb4b | 8 | #include "diffcore.h" |
6973dcae | 9 | #include "revision.h" |
1cfe7733 | 10 | #include "cache-tree.h" |
d1f2d7e8 | 11 | #include "unpack-trees.h" |
948dd346 | 12 | #include "refs.h" |
ee6fc514 | 13 | #include "submodule.h" |
427dcb4b | 14 | |
b46f0b6d | 15 | /* |
6973dcae | 16 | * diff-files |
b46f0b6d | 17 | */ |
f0c6b2a2 | 18 | |
948dd346 | 19 | /* |
1392a377 JH |
20 | * Has the work tree entity been removed? |
21 | * | |
22 | * Return 1 if it was removed from the work tree, 0 if an entity to be | |
23 | * compared with the cache entry ce still exists (the latter includes | |
24 | * the case where a directory that is not a submodule repository | |
25 | * exists for ce that is a submodule -- it is a submodule that is not | |
26 | * checked out). Return negative for an error. | |
948dd346 | 27 | */ |
c40641b7 | 28 | static int check_removed(const struct cache_entry *ce, struct stat *st) |
948dd346 JH |
29 | { |
30 | if (lstat(ce->name, st) < 0) { | |
31 | if (errno != ENOENT && errno != ENOTDIR) | |
32 | return -1; | |
33 | return 1; | |
34 | } | |
57199892 | 35 | if (has_symlink_leading_path(ce->name, ce_namelen(ce))) |
948dd346 JH |
36 | return 1; |
37 | if (S_ISDIR(st->st_mode)) { | |
38 | unsigned char sub[20]; | |
1392a377 JH |
39 | |
40 | /* | |
41 | * If ce is already a gitlink, we can have a plain | |
42 | * directory (i.e. the submodule is not checked out), | |
43 | * or a checked out submodule. Either case this is not | |
44 | * a case where something was removed from the work tree, | |
45 | * so we will return 0. | |
46 | * | |
47 | * Otherwise, if the directory is not a submodule | |
48 | * repository, that means ce which was a blob turned into | |
49 | * a directory --- the blob was removed! | |
50 | */ | |
51 | if (!S_ISGITLINK(ce->ce_mode) && | |
52 | resolve_gitlink_ref(ce->name, "HEAD", sub)) | |
948dd346 JH |
53 | return 1; |
54 | } | |
55 | return 0; | |
56 | } | |
d516c2d1 | 57 | |
ae6d5c1b JL |
58 | /* |
59 | * Has a file changed or has a submodule new commits or a dirty work tree? | |
60 | * | |
61 | * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES | |
62 | * option is set, the caller does not only want to know if a submodule is | |
63 | * modified at all but wants to know all the conditions that are met (new | |
64 | * commits, untracked content and/or modified content). | |
65 | */ | |
66 | static int match_stat_with_submodule(struct diff_options *diffopt, | |
67 | struct cache_entry *ce, struct stat *st, | |
68 | unsigned ce_option, unsigned *dirty_submodule) | |
69 | { | |
70 | int changed = ce_match_stat(ce, st, ce_option); | |
71 | if (S_ISGITLINK(ce->ce_mode) | |
72 | && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES) | |
73 | && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) { | |
3bfc4504 | 74 | *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES)); |
ae6d5c1b JL |
75 | } |
76 | return changed; | |
77 | } | |
78 | ||
4bd5b7da | 79 | int run_diff_files(struct rev_info *revs, unsigned int option) |
f0c6b2a2 | 80 | { |
6973dcae JH |
81 | int entries, i; |
82 | int diff_unmerged_stage = revs->max_count; | |
4bd5b7da | 83 | int silent_on_removed = option & DIFF_SILENT_ON_REMOVED; |
fb63d7f8 JH |
84 | unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) |
85 | ? CE_MATCH_RACY_IS_DIRTY : 0); | |
f0c6b2a2 | 86 | |
a5a818ee JH |
87 | diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); |
88 | ||
6973dcae JH |
89 | if (diff_unmerged_stage < 0) |
90 | diff_unmerged_stage = 2; | |
b4e1e4a7 | 91 | entries = active_nr; |
6973dcae | 92 | for (i = 0; i < entries; i++) { |
be3cfa85 | 93 | struct stat st; |
6973dcae JH |
94 | unsigned int oldmode, newmode; |
95 | struct cache_entry *ce = active_cache[i]; | |
96 | int changed; | |
e3d42c47 | 97 | unsigned dirty_submodule = 0; |
8676eb43 | 98 | |
90b19941 | 99 | if (DIFF_OPT_TST(&revs->diffopt, QUICK) && |
8f67f8ae | 100 | DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) |
822cac01 JH |
101 | break; |
102 | ||
6973dcae | 103 | if (!ce_path_match(ce, revs->prune_data)) |
8676eb43 | 104 | continue; |
be3cfa85 | 105 | |
6973dcae | 106 | if (ce_stage(ce)) { |
b4b15503 | 107 | struct combine_diff_path *dpath; |
6973dcae | 108 | int num_compare_stages = 0; |
b4b15503 | 109 | size_t path_len; |
6973dcae | 110 | |
b4b15503 FF |
111 | path_len = ce_namelen(ce); |
112 | ||
4fc970c4 | 113 | dpath = xmalloc(combine_diff_path_size(5, path_len)); |
b4b15503 FF |
114 | dpath->path = (char *) &(dpath->parent[5]); |
115 | ||
116 | dpath->next = NULL; | |
117 | dpath->len = path_len; | |
118 | memcpy(dpath->path, ce->name, path_len); | |
119 | dpath->path[path_len] = '\0'; | |
a8e0d16d | 120 | hashclr(dpath->sha1); |
b4b15503 | 121 | memset(&(dpath->parent[0]), 0, |
4fc970c4 JH |
122 | sizeof(struct combine_diff_parent)*5); |
123 | ||
c40641b7 | 124 | changed = check_removed(ce, &st); |
f58dbf23 JH |
125 | if (!changed) |
126 | dpath->mode = ce_mode_from_stat(ce, st.st_mode); | |
127 | else { | |
128 | if (changed < 0) { | |
4fc970c4 JH |
129 | perror(ce->name); |
130 | continue; | |
131 | } | |
132 | if (silent_on_removed) | |
133 | continue; | |
134 | } | |
6973dcae JH |
135 | |
136 | while (i < entries) { | |
137 | struct cache_entry *nce = active_cache[i]; | |
138 | int stage; | |
139 | ||
140 | if (strcmp(ce->name, nce->name)) | |
141 | break; | |
142 | ||
143 | /* Stage #2 (ours) is the first parent, | |
144 | * stage #3 (theirs) is the second. | |
145 | */ | |
146 | stage = ce_stage(nce); | |
147 | if (2 <= stage) { | |
7a51ed66 | 148 | int mode = nce->ce_mode; |
6973dcae | 149 | num_compare_stages++; |
e702496e | 150 | hashcpy(dpath->parent[stage-2].sha1, nce->sha1); |
7a51ed66 | 151 | dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode); |
b4b15503 | 152 | dpath->parent[stage-2].status = |
6973dcae JH |
153 | DIFF_STATUS_MODIFIED; |
154 | } | |
155 | ||
156 | /* diff against the proper unmerged stage */ | |
157 | if (stage == diff_unmerged_stage) | |
158 | ce = nce; | |
159 | i++; | |
160 | } | |
161 | /* | |
162 | * Compensate for loop update | |
f0c6b2a2 | 163 | */ |
6973dcae | 164 | i--; |
6b5ee137 | 165 | |
6973dcae | 166 | if (revs->combine_merges && num_compare_stages == 2) { |
b4b15503 | 167 | show_combined_diff(dpath, 2, |
6973dcae JH |
168 | revs->dense_combined_merges, |
169 | revs); | |
b4b15503 | 170 | free(dpath); |
6973dcae | 171 | continue; |
1b1480ff | 172 | } |
b4b15503 FF |
173 | free(dpath); |
174 | dpath = NULL; | |
0e3994fa | 175 | |
6973dcae JH |
176 | /* |
177 | * Show the diff for the 'ce' if we found the one | |
178 | * from the desired stage. | |
179 | */ | |
e9c84099 | 180 | diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1); |
6973dcae JH |
181 | if (ce_stage(ce) != diff_unmerged_stage) |
182 | continue; | |
eeaa4603 | 183 | } |
6b14d7fa | 184 | |
125fd984 | 185 | if (ce_uptodate(ce) || ce_skip_worktree(ce)) |
d1f2d7e8 | 186 | continue; |
f58dbf23 | 187 | |
540e694b NTND |
188 | /* If CE_VALID is set, don't look at workdir for file removal */ |
189 | changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st); | |
f58dbf23 JH |
190 | if (changed) { |
191 | if (changed < 0) { | |
6973dcae | 192 | perror(ce->name); |
15d061b4 JH |
193 | continue; |
194 | } | |
6973dcae JH |
195 | if (silent_on_removed) |
196 | continue; | |
7a51ed66 | 197 | diff_addremove(&revs->diffopt, '-', ce->ce_mode, |
e3d42c47 | 198 | ce->sha1, ce->name, 0); |
6973dcae | 199 | continue; |
f2ce9fde | 200 | } |
ae6d5c1b JL |
201 | changed = match_stat_with_submodule(&revs->diffopt, ce, &st, |
202 | ce_option, &dirty_submodule); | |
85adbf2f | 203 | if (!changed && !dirty_submodule) { |
8fa29602 JH |
204 | ce_mark_uptodate(ce); |
205 | if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) | |
206 | continue; | |
207 | } | |
7a51ed66 LT |
208 | oldmode = ce->ce_mode; |
209 | newmode = ce_mode_from_stat(ce, st.st_mode); | |
6973dcae JH |
210 | diff_change(&revs->diffopt, oldmode, newmode, |
211 | ce->sha1, (changed ? null_sha1 : ce->sha1), | |
e3d42c47 | 212 | ce->name, 0, dirty_submodule); |
77eb2720 | 213 | |
7ca45252 | 214 | } |
6973dcae JH |
215 | diffcore_std(&revs->diffopt); |
216 | diff_flush(&revs->diffopt); | |
217 | return 0; | |
77eb2720 | 218 | } |
be3cfa85 | 219 | |
e09ad6e1 JH |
220 | /* |
221 | * diff-index | |
222 | */ | |
223 | ||
224 | /* A file entry went away or appeared */ | |
225 | static void diff_index_show_file(struct rev_info *revs, | |
226 | const char *prefix, | |
227 | struct cache_entry *ce, | |
e3d42c47 JL |
228 | const unsigned char *sha1, unsigned int mode, |
229 | unsigned dirty_submodule) | |
e09ad6e1 | 230 | { |
7a51ed66 | 231 | diff_addremove(&revs->diffopt, prefix[0], mode, |
e3d42c47 | 232 | sha1, ce->name, dirty_submodule); |
e09ad6e1 JH |
233 | } |
234 | ||
235 | static int get_stat_data(struct cache_entry *ce, | |
c8c16f28 | 236 | const unsigned char **sha1p, |
e09ad6e1 | 237 | unsigned int *modep, |
e3d42c47 | 238 | int cached, int match_missing, |
4d34477f | 239 | unsigned *dirty_submodule, struct diff_options *diffopt) |
e09ad6e1 | 240 | { |
c8c16f28 | 241 | const unsigned char *sha1 = ce->sha1; |
e09ad6e1 JH |
242 | unsigned int mode = ce->ce_mode; |
243 | ||
658dd48c | 244 | if (!cached && !ce_uptodate(ce)) { |
e09ad6e1 JH |
245 | int changed; |
246 | struct stat st; | |
c40641b7 | 247 | changed = check_removed(ce, &st); |
948dd346 JH |
248 | if (changed < 0) |
249 | return -1; | |
250 | else if (changed) { | |
251 | if (match_missing) { | |
e09ad6e1 JH |
252 | *sha1p = sha1; |
253 | *modep = mode; | |
254 | return 0; | |
255 | } | |
256 | return -1; | |
257 | } | |
ae6d5c1b JL |
258 | changed = match_stat_with_submodule(diffopt, ce, &st, |
259 | 0, dirty_submodule); | |
e3d42c47 | 260 | if (changed) { |
185c975f | 261 | mode = ce_mode_from_stat(ce, st.st_mode); |
c8c16f28 | 262 | sha1 = null_sha1; |
e09ad6e1 JH |
263 | } |
264 | } | |
265 | ||
266 | *sha1p = sha1; | |
267 | *modep = mode; | |
268 | return 0; | |
269 | } | |
270 | ||
ff7e6aad | 271 | static void show_new_file(struct rev_info *revs, |
e09ad6e1 JH |
272 | struct cache_entry *new, |
273 | int cached, int match_missing) | |
274 | { | |
c8c16f28 | 275 | const unsigned char *sha1; |
e09ad6e1 | 276 | unsigned int mode; |
e3d42c47 | 277 | unsigned dirty_submodule = 0; |
e09ad6e1 | 278 | |
948dd346 JH |
279 | /* |
280 | * New file in the index: it might actually be different in | |
e09ad6e1 JH |
281 | * the working copy. |
282 | */ | |
e3d42c47 | 283 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, |
4d34477f | 284 | &dirty_submodule, &revs->diffopt) < 0) |
e09ad6e1 JH |
285 | return; |
286 | ||
e3d42c47 | 287 | diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule); |
e09ad6e1 JH |
288 | } |
289 | ||
ff7e6aad | 290 | static int show_modified(struct rev_info *revs, |
e09ad6e1 JH |
291 | struct cache_entry *old, |
292 | struct cache_entry *new, | |
293 | int report_missing, | |
294 | int cached, int match_missing) | |
295 | { | |
296 | unsigned int mode, oldmode; | |
c8c16f28 | 297 | const unsigned char *sha1; |
e3d42c47 | 298 | unsigned dirty_submodule = 0; |
e09ad6e1 | 299 | |
e3d42c47 | 300 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, |
4d34477f | 301 | &dirty_submodule, &revs->diffopt) < 0) { |
e09ad6e1 JH |
302 | if (report_missing) |
303 | diff_index_show_file(revs, "-", old, | |
e3d42c47 | 304 | old->sha1, old->ce_mode, 0); |
e09ad6e1 JH |
305 | return -1; |
306 | } | |
307 | ||
cb2b9f5e PM |
308 | if (revs->combine_merges && !cached && |
309 | (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) { | |
310 | struct combine_diff_path *p; | |
311 | int pathlen = ce_namelen(new); | |
312 | ||
313 | p = xmalloc(combine_diff_path_size(2, pathlen)); | |
314 | p->path = (char *) &p->parent[2]; | |
315 | p->next = NULL; | |
316 | p->len = pathlen; | |
317 | memcpy(p->path, new->name, pathlen); | |
318 | p->path[pathlen] = 0; | |
7a51ed66 | 319 | p->mode = mode; |
cb2b9f5e PM |
320 | hashclr(p->sha1); |
321 | memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); | |
322 | p->parent[0].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 323 | p->parent[0].mode = new->ce_mode; |
cb2b9f5e PM |
324 | hashcpy(p->parent[0].sha1, new->sha1); |
325 | p->parent[1].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 326 | p->parent[1].mode = old->ce_mode; |
cb2b9f5e PM |
327 | hashcpy(p->parent[1].sha1, old->sha1); |
328 | show_combined_diff(p, 2, revs->dense_combined_merges, revs); | |
329 | free(p); | |
330 | return 0; | |
331 | } | |
332 | ||
e09ad6e1 | 333 | oldmode = old->ce_mode; |
85adbf2f | 334 | if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule && |
8f67f8ae | 335 | !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) |
e09ad6e1 JH |
336 | return 0; |
337 | ||
e09ad6e1 | 338 | diff_change(&revs->diffopt, oldmode, mode, |
e3d42c47 | 339 | old->sha1, sha1, old->name, 0, dirty_submodule); |
e09ad6e1 JH |
340 | return 0; |
341 | } | |
342 | ||
d1f2d7e8 LT |
343 | /* |
344 | * This gets a mix of an existing index and a tree, one pathname entry | |
345 | * at a time. The index entry may be a single stage-0 one, but it could | |
346 | * also be multiple unmerged entries (in which case idx_pos/idx_nr will | |
347 | * give you the position and number of entries in the index). | |
348 | */ | |
349 | static void do_oneway_diff(struct unpack_trees_options *o, | |
350 | struct cache_entry *idx, | |
34110cd4 | 351 | struct cache_entry *tree) |
e09ad6e1 | 352 | { |
ff7e6aad | 353 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 354 | int match_missing, cached; |
5c21ac0e | 355 | |
540e694b | 356 | /* if the entry is not checked out, don't examine work tree */ |
b4d1690d NTND |
357 | cached = o->index_only || |
358 | (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); | |
a6080a0a | 359 | /* |
5c21ac0e | 360 | * Backward compatibility wart - "diff-index -m" does |
d1f2d7e8 LT |
361 | * not mean "do not ignore merges", but "match_missing". |
362 | * | |
363 | * But with the revision flag parsing, that's found in | |
364 | * "!revs->ignore_merges". | |
365 | */ | |
d1f2d7e8 LT |
366 | match_missing = !revs->ignore_merges; |
367 | ||
368 | if (cached && idx && ce_stage(idx)) { | |
29796c6c JH |
369 | diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, |
370 | idx->sha1); | |
d1f2d7e8 LT |
371 | return; |
372 | } | |
373 | ||
374 | /* | |
375 | * Something added to the tree? | |
376 | */ | |
377 | if (!tree) { | |
ff7e6aad | 378 | show_new_file(revs, idx, cached, match_missing); |
d1f2d7e8 LT |
379 | return; |
380 | } | |
381 | ||
382 | /* | |
383 | * Something removed from the tree? | |
5c21ac0e | 384 | */ |
d1f2d7e8 | 385 | if (!idx) { |
e3d42c47 | 386 | diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0); |
d1f2d7e8 LT |
387 | return; |
388 | } | |
389 | ||
390 | /* Show difference between old and new */ | |
ff7e6aad | 391 | show_modified(revs, tree, idx, 1, cached, match_missing); |
d1f2d7e8 LT |
392 | } |
393 | ||
d1f2d7e8 LT |
394 | /* |
395 | * The unpack_trees() interface is designed for merging, so | |
396 | * the different source entries are designed primarily for | |
397 | * the source trees, with the old index being really mainly | |
398 | * used for being replaced by the result. | |
399 | * | |
400 | * For diffing, the index is more important, and we only have a | |
401 | * single tree. | |
402 | * | |
da8ba5e7 | 403 | * We're supposed to advance o->pos to skip what we have already processed. |
d1f2d7e8 LT |
404 | * |
405 | * This wrapper makes it all more readable, and takes care of all | |
406 | * the fairly complex unpack_trees() semantic requirements, including | |
407 | * the skipping, the path matching, the type conflict cases etc. | |
408 | */ | |
34110cd4 | 409 | static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o) |
d1f2d7e8 | 410 | { |
d1f2d7e8 LT |
411 | struct cache_entry *idx = src[0]; |
412 | struct cache_entry *tree = src[1]; | |
ff7e6aad | 413 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 414 | |
d1f2d7e8 LT |
415 | /* |
416 | * Unpack-trees generates a DF/conflict entry if | |
417 | * there was a directory in the index and a tree | |
418 | * in the tree. From a diff standpoint, that's a | |
419 | * delete of the tree and a create of the file. | |
420 | */ | |
421 | if (tree == o->df_conflict_entry) | |
422 | tree = NULL; | |
423 | ||
424 | if (ce_path_match(idx ? idx : tree, revs->prune_data)) | |
34110cd4 | 425 | do_oneway_diff(o, idx, tree); |
d1f2d7e8 | 426 | |
34110cd4 | 427 | return 0; |
d1f2d7e8 LT |
428 | } |
429 | ||
430 | int run_diff_index(struct rev_info *revs, int cached) | |
431 | { | |
432 | struct object *ent; | |
433 | struct tree *tree; | |
434 | const char *tree_name; | |
435 | struct unpack_trees_options opts; | |
436 | struct tree_desc t; | |
e09ad6e1 | 437 | |
1f1e895f LT |
438 | ent = revs->pending.objects[0].item; |
439 | tree_name = revs->pending.objects[0].name; | |
e09ad6e1 JH |
440 | tree = parse_tree_indirect(ent->sha1); |
441 | if (!tree) | |
442 | return error("bad tree object %s", tree_name); | |
d1f2d7e8 LT |
443 | |
444 | memset(&opts, 0, sizeof(opts)); | |
445 | opts.head_idx = 1; | |
446 | opts.index_only = cached; | |
a0919ced JH |
447 | opts.diff_index_cached = (cached && |
448 | !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)); | |
d1f2d7e8 LT |
449 | opts.merge = 1; |
450 | opts.fn = oneway_diff; | |
ff7e6aad | 451 | opts.unpack_data = revs; |
34110cd4 LT |
452 | opts.src_index = &the_index; |
453 | opts.dst_index = NULL; | |
d1f2d7e8 LT |
454 | |
455 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
456 | if (unpack_trees(1, &t, &opts)) |
457 | exit(128); | |
d1f2d7e8 | 458 | |
a5a818ee | 459 | diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); |
730f7284 | 460 | diffcore_fix_diff_index(&revs->diffopt); |
e09ad6e1 JH |
461 | diffcore_std(&revs->diffopt); |
462 | diff_flush(&revs->diffopt); | |
d1f2d7e8 | 463 | return 0; |
e09ad6e1 | 464 | } |
1cfe7733 JH |
465 | |
466 | int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt) | |
467 | { | |
468 | struct tree *tree; | |
469 | struct rev_info revs; | |
470 | int i; | |
471 | struct cache_entry **dst; | |
472 | struct cache_entry *last = NULL; | |
204ce979 JS |
473 | struct unpack_trees_options opts; |
474 | struct tree_desc t; | |
1cfe7733 JH |
475 | |
476 | /* | |
477 | * This is used by git-blame to run diff-cache internally; | |
478 | * it potentially needs to repeatedly run this, so we will | |
479 | * start by removing the higher order entries the last round | |
480 | * left behind. | |
481 | */ | |
482 | dst = active_cache; | |
483 | for (i = 0; i < active_nr; i++) { | |
484 | struct cache_entry *ce = active_cache[i]; | |
485 | if (ce_stage(ce)) { | |
486 | if (last && !strcmp(ce->name, last->name)) | |
487 | continue; | |
488 | cache_tree_invalidate_path(active_cache_tree, | |
489 | ce->name); | |
490 | last = ce; | |
7a51ed66 | 491 | ce->ce_flags |= CE_REMOVE; |
1cfe7733 JH |
492 | } |
493 | *dst++ = ce; | |
494 | } | |
495 | active_nr = dst - active_cache; | |
496 | ||
497 | init_revisions(&revs, NULL); | |
498 | revs.prune_data = opt->paths; | |
499 | tree = parse_tree_indirect(tree_sha1); | |
500 | if (!tree) | |
501 | die("bad tree object %s", sha1_to_hex(tree_sha1)); | |
204ce979 JS |
502 | |
503 | memset(&opts, 0, sizeof(opts)); | |
504 | opts.head_idx = 1; | |
505 | opts.index_only = 1; | |
a0919ced | 506 | opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER); |
204ce979 JS |
507 | opts.merge = 1; |
508 | opts.fn = oneway_diff; | |
ff7e6aad | 509 | opts.unpack_data = &revs; |
34110cd4 LT |
510 | opts.src_index = &the_index; |
511 | opts.dst_index = &the_index; | |
204ce979 JS |
512 | |
513 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
514 | if (unpack_trees(1, &t, &opts)) |
515 | exit(128); | |
204ce979 | 516 | return 0; |
1cfe7733 | 517 | } |
75f3ff2e SB |
518 | |
519 | int index_differs_from(const char *def, int diff_flags) | |
520 | { | |
521 | struct rev_info rev; | |
32962c9b | 522 | struct setup_revision_opt opt; |
75f3ff2e SB |
523 | |
524 | init_revisions(&rev, NULL); | |
32962c9b JH |
525 | memset(&opt, 0, sizeof(opt)); |
526 | opt.def = def; | |
527 | setup_revisions(0, NULL, &rev, &opt); | |
90b19941 | 528 | DIFF_OPT_SET(&rev.diffopt, QUICK); |
75f3ff2e SB |
529 | DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS); |
530 | rev.diffopt.flags |= diff_flags; | |
531 | run_diff_index(&rev, 1); | |
532 | if (rev.pending.alloc) | |
533 | free(rev.pending.objects); | |
534 | return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0); | |
535 | } |