Merge branch 'nd/untracked-cache'

gitster · gitster · commit 6f59058e490f · 2015-06-24T12:21:49.000-07:00
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
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

Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e`
`999`	`999`	`}`
`1000`	`1000`	`pos = -pos-1;`
`1001`	`1001`
`1002`		`- untracked_cache_add_to_index(istate, ce->name);`
	`1002`	`+ if (!(option & ADD_CACHE_KEEP_CACHE_TREE))`
	`1003`	`+ untracked_cache_add_to_index(istate, ce->name);`
`1003`	`1004`
`1004`	`1005`	`/*`
`1005`	`1006`	`* Inserting a merged entry ("stage 0") into the index`