summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-22 19:36:19 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-22 19:36:19 -0700
commitea0b767c1ea66f687e58a9fcff45a5a518e699c3 (patch)
tree9f9c5fa3aef71f723d8cabf4b0374eb6cd27f935 /builtin-checkout.c
parent7613ea3595f3a56f0f9d827944775940f1e72ef6 (diff)
parent83ae209bf9708bf1b67dbac4a3629a0003af5dbb (diff)
downloadgit-ea0b767c1ea66f687e58a9fcff45a5a518e699c3.tar.gz
Merge branch 'jc/maint-read-tree-multi'
* jc/maint-read-tree-multi: checkout branch: prime cache-tree fully read-tree -m A B: prime cache-tree from the switched-to tree Move prime_cache_tree() to cache-tree.c read-tree A B: do not corrupt cache-tree
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 383598c9bf..15f0c32c7a 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -5,6 +5,7 @@
#include "commit.h"
#include "tree.h"
#include "tree-walk.h"
+#include "cache-tree.h"
#include "unpack-trees.h"
#include "dir.h"
#include "run-command.h"
@@ -364,14 +365,17 @@ static int merge_working_tree(struct checkout_opts *opts,
int ret;
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
int newfd = hold_locked_index(lock_file, 1);
+ int reprime_cache_tree = 0;
if (read_cache() < 0)
return error("corrupt index file");
+ cache_tree_free(&active_cache_tree);
if (opts->force) {
ret = reset_tree(new->commit->tree, opts, 1);
if (ret)
return ret;
+ reprime_cache_tree = 1;
} else {
struct tree_desc trees[2];
struct tree *tree;
@@ -407,7 +411,9 @@ static int merge_working_tree(struct checkout_opts *opts,
init_tree_desc(&trees[1], tree->buffer, tree->size);
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
* give up or do a real merge, depending on
@@ -451,6 +457,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) ||
commit_locked_index(lock_file))
die("unable to write new index file");