development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-06-13 19:19:33 +07:00 committed by Junio C Hamano
parent d0cfc3e866
commit e6c286e8b2
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/read-tree.c
View file

@ -231,7 +231,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
* what came from the tree. * what came from the tree.
*/ */
if (nr_trees == 1 && !opts.prefix) 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)) if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die("unable to write new index file"); die("unable to write new index file");

2
builtin/reset.c
View file

@ -84,7 +84,7 @@ static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
if (reset_type == MIXED || reset_type == HARD) { if (reset_type == MIXED || reset_type == HARD) {
tree = parse_tree_indirect(sha1); tree = parse_tree_indirect(sha1);
prime_cache_tree(&active_cache_tree, tree); prime_cache_tree(&the_index, tree);
} }
return 0; return 0;

9
cache-tree.c
View file

@ -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); cache_tree_free(&istate->cache_tree);
*it = cache_tree(); istate->cache_tree = cache_tree();
prime_cache_tree_rec(*it, tree); prime_cache_tree_rec(istate->cache_tree, tree);
istate->cache_changed |= CACHE_TREE_CHANGED;
} }
/* /*

2
cache-tree.h
View file

@ -46,7 +46,7 @@ int update_main_cache_tree(int);
#define WRITE_TREE_PREFIX_ERROR (-3) #define WRITE_TREE_PREFIX_ERROR (-3)
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix); 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);