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
git-mirror · Jun 24, 2015 · 6f59058 · 6f59058
2 parents 8f61ccf + ffcc9ba
commit 6f59058
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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