mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.2' into maint

Browse Source 
* maint-1.6.2:
  Revert "checkout branch: prime cache-tree fully"
This commit is contained in:
Junio C Hamano
2009-05-12 09:58:34 -07:00
parent ec00d6e003 a83502f8e5
commit 235236c83d
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-checkout.c
View File

@ -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");