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