kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-06-24 12:21:49 -07:00
parent 8f61ccf15d ffcc9ba763
commit 6f59058e49
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
read-cache.c
View File

@ -999,7 +999,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
} }
pos = -pos-1; 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 * Inserting a merged entry ("stage 0") into the index