cache-tree: mark istate->cache_changed on prime_cache_tree()

pclouds · gitster · commit e6c286e8b2d0 · 2014-06-13T11:49:39.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
@@ -231,7 +231,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	 * what came from the tree.
 	 */
 	if (nr_trees == 1 && !opts.prefix)
-		prime_cache_tree(&active_cache_tree, trees[0]);
+		prime_cache_tree(&the_index, trees[0]);
 
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 		die("unable to write new index file");
diff --git a/builtin/reset.c b/builtin/reset.c
@@ -84,7 +84,7 @@ static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
 
 	if (reset_type == MIXED || reset_type == HARD) {
 		tree = parse_tree_indirect(sha1);
-		prime_cache_tree(&active_cache_tree, tree);
+		prime_cache_tree(&the_index, tree);
 	}
 
 	return 0;
diff --git a/cache-tree.c b/cache-tree.c
@@ -654,11 +654,12 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
 	it->entry_count = cnt;
 }
 
-void prime_cache_tree(struct cache_tree **it, struct tree *tree)
+void prime_cache_tree(struct index_state *istate, struct tree *tree)
 {
-	cache_tree_free(it);
-	*it = cache_tree();
-	prime_cache_tree_rec(*it, tree);
+	cache_tree_free(&istate->cache_tree);
+	istate->cache_tree = cache_tree();
+	prime_cache_tree_rec(istate->cache_tree, tree);
+	istate->cache_changed |= CACHE_TREE_CHANGED;
 }
 
 /*
diff --git a/cache-tree.h b/cache-tree.h
@@ -46,7 +46,7 @@ int update_main_cache_tree(int);
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
 int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
-void prime_cache_tree(struct cache_tree **, struct tree *);
+void prime_cache_tree(struct index_state *, struct tree *);
 
 extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static int reset_index(const unsigned char *sha1, int reset_type, int quiet)`
`84`	`84`
`85`	`85`	`if (reset_type == MIXED \|\| reset_type == HARD) {`
`86`	`86`	`tree = parse_tree_indirect(sha1);`
`87`		`- prime_cache_tree(&active_cache_tree, tree);`
	`87`	`+ prime_cache_tree(&the_index, tree);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -654,11 +654,12 @@ static void prime_cache_tree_rec(struct cache_tree it, struct tree tree)`
`654`	`654`	`it->entry_count = cnt;`
`655`	`655`	`}`
`656`	`656`
`657`		`-void prime_cache_tree(struct cache_tree *it, struct tree tree)`
	`657`	`+void prime_cache_tree(struct index_state istate, struct tree tree)`
`658`	`658`	`{`
`659`		`- cache_tree_free(it);`
`660`		`- *it = cache_tree();`
`661`		`- prime_cache_tree_rec(*it, tree);`
	`659`	`+ cache_tree_free(&istate->cache_tree);`
	`660`	`+ istate->cache_tree = cache_tree();`
	`661`	`+ prime_cache_tree_rec(istate->cache_tree, tree);`
	`662`	`+ istate->cache_changed \|= CACHE_TREE_CHANGED;`
`662`	`663`	`}`
`663`	`664`
`664`	`665`	`/*`