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

Merge branch 'maint'

Browse Source 
* maint:
  GIT 1.6.3.1
  Revert "checkout branch: prime cache-tree fully"
This commit is contained in:
Junio C Hamano
2009-05-12 22:51:09 -07:00
parent eb127887fa 4774780ab1
commit 4bf1f68ee7
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/RelNotes-1.6.3.1.txt
View File

@ -4,9 +4,7 @@ GIT v1.6.3.1 Release Notes
Fixes since v1.6.3 Fixes since v1.6.3
------------------ ------------------
-- * "git checkout -b new-branch" with a staged change in the index
exec >/var/tmp/1 incorrectly primed the in-index cache-tree, resulting a wrong tree
O=v1.6.3 object to be written out of the index. This is a grave regression
echo O=$(git describe maint) since the last 1.6.2.X maintenance release.
git shortlog $O..maint

9
builtin-checkout.c
View File

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

28
t/t2014-switch.sh Executable file
View 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