undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout branch: prime cache-tree fully

Browse Source 
When switching to another branch, the earlier code relied on incremental
invalidation of cache-tree entries to degrade it.  While it is not wrong
per-se, we know that the resulting index must fully match the branch we
are switching to unless the -m (merge) option is used.

We should simply fully re-prime the cache-tree using the new tree object
in such a case.  And for safety, invalidate the cache-tree as a whole in
other cases.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2009-04-20 03:58:20 -07:00
parent 456156dc06
commit 83ae209bf9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-checkout.c
View File

@ -368,14 +368,17 @@ static int merge_working_tree(struct checkout_opts *opts,
int ret; int ret;
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
int newfd = hold_locked_index(lock_file, 1); int newfd = hold_locked_index(lock_file, 1);
int reprime_cache_tree = 0;
if (read_cache() < 0) if (read_cache() < 0)
return error("corrupt index file"); return error("corrupt index file");
cache_tree_free(&active_cache_tree);
if (opts->force) { if (opts->force) {
ret = reset_tree(new->commit->tree, opts, 1); ret = reset_tree(new->commit->tree, opts, 1);
if (ret) if (ret)
return ret; return ret;
reprime_cache_tree = 1;
} else { } else {
struct tree_desc trees[2]; struct tree_desc trees[2];
struct tree *tree; struct tree *tree;
@ -411,7 +414,9 @@ static int merge_working_tree(struct checkout_opts *opts,
init_tree_desc(&trees[1], tree->buffer, tree->size); init_tree_desc(&trees[1], tree->buffer, tree->size);
ret = unpack_trees(2, trees, &topts); ret = unpack_trees(2, trees, &topts);
if (ret == -1) { if (ret != -1) {
reprime_cache_tree = 1;
} else {
/* /*
* Unpack couldn't do a trivial merge; either * Unpack couldn't do a trivial merge; either
* give up or do a real merge, depending on * give up or do a real merge, depending on
@ -455,6 +460,8 @@ static int merge_working_tree(struct checkout_opts *opts,
} }
} }
if (reprime_cache_tree)
prime_cache_tree(&active_cache_tree, new->commit->tree);
if (write_cache(newfd, active_cache, active_nr) || if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock_file)) commit_locked_index(lock_file))
die("unable to write new index file"); die("unable to write new index file");