diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 19:21:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 19:21:49 (GMT) |
| commit | 6f59058e490fa72c09faa974addfeeb2868dc648 (patch) | |
| tree | f39b9ccc3cb5d68437b30e1089007a7d72fae346 /read-cache.c | |
| parent | 8f61ccf15d7699bf8ce13d08337573a5baecfe47 (diff) | |
| parent | ffcc9ba763a8591119cb28877c84499a7854bff9 (diff) | |
| download | git-6f59058e490fa72c09faa974addfeeb2868dc648.zip git-6f59058e490fa72c09faa974addfeeb2868dc648.tar.gz git-6f59058e490fa72c09faa974addfeeb2868dc648.tar.bz2 | |
Merge branch 'nd/untracked-cache'
Hotfix for the 'untracked-cache' topic that is already in 'master'.
* nd/untracked-cache:
read-cache: fix untracked cache invalidation when split-index is used
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index 5dee4e2..89dbc08 100644 --- a/read-cache.c +++ b/read-cache.c @@ -999,7 +999,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e } pos = -pos-1; - untracked_cache_add_to_index(istate, ce->name); + if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) + untracked_cache_add_to_index(istate, ce->name); /* * Inserting a merged entry ("stage 0") into the index |