checkout branch: prime cache-tree fully
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>
Junio C Hamano committed
Apr 20, 2009 at 03:58 UTC
83ae209bf9708bf1b67dbac4a3629a0003af5dbb
1 file changed
+8
-1
builtin-checkout.c
+8
-1
@@ -368,14 +368,17 @@ static int merge_working_tree(struct checkout_opts *opts,
368
int ret;
369
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
370
int newfd = hold_locked_index(lock_file, 1);
371
+ int reprime_cache_tree = 0;
372
373
if (read_cache() < 0)
374
return error("corrupt index file");
375
376
+ cache_tree_free(&active_cache_tree);
377
if (opts->force) {
378
ret = reset_tree(new->commit->tree, opts, 1);
379
if (ret)
380
return ret;
381
+ reprime_cache_tree = 1;
382
} else {
383
struct tree_desc trees[2];
384
struct tree *tree;
@@ -411,7 +414,9 @@ static int merge_working_tree(struct checkout_opts *opts,
414
init_tree_desc(&trees[1], tree->buffer, tree->size);
415
416
ret = unpack_trees(2, trees, &topts);
414
- if (ret == -1) {
417
+ if (ret != -1) {
418
+ reprime_cache_tree = 1;
419
+ } else {
420
/*
421
* Unpack couldn't do a trivial merge; either
422
* give up or do a real merge, depending on
@@ -455,6 +460,8 @@ static int merge_working_tree(struct checkout_opts *opts,
460
}
461
}
462
463
+ if (reprime_cache_tree)
464
+ prime_cache_tree(&active_cache_tree, new->commit->tree);
465
if (write_cache(newfd, active_cache, active_nr) ||
466
commit_locked_index(lock_file))
467
die("unable to write new index file");