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