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>

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index f26d90f5429e46af074a5cab2fc76e932fdde790..3204c62eaf26d0db69d360695725e4b51ca686e1 100644 (file)
--- 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)
         * 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");
 
        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
index 0c56d28e168c24cc1444add7c7ca46bef7d61858..234b2eb44a4be901e8d2847c698835314086bdcd 100644 (file)
--- 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);
 
        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;
        }
 
        return 0;

diff --git a/cache-tree.c b/cache-tree.c
index 18055f1c9600b8c8d2b5af0556d077f05452b3f8..c53f7de2b13acfc1b97c60b04552e57791377442 100644 (file)
--- 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;
 }
 
        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
index 154b357f914b576b3a38933ed31b2bc1b3999f90..b47ccec7f626d7cda34ed17661c1dc3e4f035d6a 100644 (file)
--- 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);
 #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);
 
 
 extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);