diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:51 +0900 |
| commit | 7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87 (patch) | |
| tree | cce91296a436de34b3f81fe0ea4b433110ec69b5 /split-index.c | |
| parent | 36eb1cb9cfe327583128a4b0abdf9516c2ca815b (diff) | |
| parent | e92aa0e4ef5a91781530449f9466a45c16c91f7f (diff) | |
| download | git-7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87.tar.xz | |
Merge branch 'tg/checkout-no-overlay'
"git checkout --no-overlay" can be used to trigger a new mode of
checking out paths out of the tree-ish, that allows paths that
match the pathspec that are in the current index and working tree
and are not in the tree-ish.
* tg/checkout-no-overlay:
revert "checkout: introduce checkout.overlayMode config"
checkout: introduce checkout.overlayMode config
checkout: introduce --{,no-}overlay option
checkout: factor out mark_cache_entry_for_checkout function
checkout: clarify comment
read-cache: add invalidate parameter to remove_marked_cache_entries
entry: support CE_WT_REMOVE flag in checkout_entry
entry: factor out unlink_entry function
move worktree tests to t24*
Diffstat (limited to 'split-index.c')
| -rw-r--r-- | split-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/split-index.c b/split-index.c index 5820412dc5..8aebc3661b 100644 --- a/split-index.c +++ b/split-index.c @@ -162,7 +162,7 @@ void merge_base_index(struct index_state *istate) ewah_each_bit(si->replace_bitmap, replace_entry, istate); ewah_each_bit(si->delete_bitmap, mark_entry_for_delete, istate); if (si->nr_deletions) - remove_marked_cache_entries(istate); + remove_marked_cache_entries(istate, 0); for (i = si->nr_replacements; i < si->saved_cache_nr; i++) { if (!ce_namelen(si->saved_cache[i])) |