diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 16:56:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 16:56:33 -0700 |
| commit | e7c693a8e13593707c9491108d104f43dbcf5bfb (patch) | |
| tree | 7d6fe6421e2899d93b2ee64b47fc077b343e5a4a /diff-lib.c | |
| parent | f203d6969b7cfbb56460d5bf8e99b0a7d1abe03b (diff) | |
| parent | 540e694b139dd034b21de087001ac9b6d7606c94 (diff) | |
| download | git-e7c693a8e13593707c9491108d104f43dbcf5bfb.tar.gz | |
Merge branch 'nd/sparse' (early part)
* 'nd/sparse' (early part):
Prevent diff machinery from examining assume-unchanged entries on worktree
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index ad2a4cde74..22da66ef14 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -162,7 +162,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option) if (ce_uptodate(ce)) continue; - changed = check_removed(ce, &st); + /* If CE_VALID is set, don't look at workdir for file removal */ + changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st); if (changed) { if (changed < 0) { perror(ce->name); @@ -337,6 +338,8 @@ static void do_oneway_diff(struct unpack_trees_options *o, struct rev_info *revs = o->unpack_data; int match_missing, cached; + /* if the entry is not checked out, don't examine work tree */ + cached = o->index_only || (idx && (idx->ce_flags & CE_VALID)); /* * Backward compatibility wart - "diff-index -m" does * not mean "do not ignore merges", but "match_missing". @@ -344,7 +347,6 @@ static void do_oneway_diff(struct unpack_trees_options *o, * But with the revision flag parsing, that's found in * "!revs->ignore_merges". */ - cached = o->index_only; match_missing = !revs->ignore_merges; if (cached && idx && ce_stage(idx)) { |