cache-tree: mark istate->cache_changed on prime_cache_tree()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 13, 2014 at 19:19 UTC
e6c286e8b2d0748cfaa670f6738db0c232427cd3
4 files changed
+8
-7
builtin/read-tree.c
+1
-1
@@ -231,7 +231,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
231
* what came from the tree.
232
*/
233
if (nr_trees == 1 && !opts.prefix)
234
- prime_cache_tree(&active_cache_tree, trees[0]);
234
+ prime_cache_tree(&the_index, trees[0]);
235
236
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
237
die("unable to write new index file");
builtin/reset.c
+1
-1
@@ -84,7 +84,7 @@ static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
84
85
if (reset_type == MIXED || reset_type == HARD) {
86
tree = parse_tree_indirect(sha1);
87
- prime_cache_tree(&active_cache_tree, tree);
87
+ prime_cache_tree(&the_index, tree);
88
}
89
90
return 0;
cache-tree.c
+5
-4
@@ -654,11 +654,12 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
654
it->entry_count = cnt;
655
}
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
{
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;
663
}
664
665
/*
cache-tree.h
+1
-1
@@ -46,7 +46,7 @@ int update_main_cache_tree(int);
46
#define WRITE_TREE_PREFIX_ERROR (-3)
47
48
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
49
-void prime_cache_tree(struct cache_tree **, struct tree *);
49
+void prime_cache_tree(struct index_state *, struct tree *);
50
51
extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);
52