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