summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-12 09:58:34 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-12 09:58:34 -0700
commit235236c83dcff00d9df3910aaf10b74a3929068d (patch)
treea16e4de40c8d61ac614accb45b1c34c39d385d43 /builtin-checkout.c
parentec00d6e0038e030cf73182374e21025c2776cb23 (diff)
parenta83502f8e59b1dd2547f850379040ca3f931e00b (diff)
downloadgit-235236c83dcff00d9df3910aaf10b74a3929068d.tar.gz
Merge branch 'maint-1.6.2' into maint
* maint-1.6.2: Revert "checkout branch: prime cache-tree fully"
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 15f0c32c7a..dc4bfb5fc0 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -365,17 +365,14 @@ 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;
@@ -411,9 +408,7 @@ 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) {
- reprime_cache_tree = 1;
- } else {
+ if (ret == -1) {
/*
* Unpack couldn't do a trivial merge; either
* give up or do a real merge, depending on
@@ -457,8 +452,6 @@ 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");