Merge branch 'maint-1.6.2' into maint
* maint-1.6.2: Revert "checkout branch: prime cache-tree fully"maint
commit
235236c83d
|
@ -365,17 +365,14 @@ 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,9 +408,7 @@ 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
|
||||||
|
@ -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) ||
|
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");
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
test_description='Peter MacMillan'
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
test_expect_success setup '
|
||||||
|
echo Hello >file &&
|
||||||
|
git add file &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m V1 &&
|
||||||
|
echo Hello world >file &&
|
||||||
|
git add file &&
|
||||||
|
git checkout -b other
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'check all changes are staged' '
|
||||||
|
git diff --exit-code
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'second commit' '
|
||||||
|
git commit -m V2
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'check' '
|
||||||
|
git diff --cached --exit-code
|
||||||
|
'
|
||||||
|
|
||||||
|
test_done
|
Loading…
Reference in New Issue