# stage/commit issue when checking out a branch 3 messages from 2009-05-12 to 2009-05-12. Participants: Peter MacMillan, Junio C Hamano. Thread: https://gitlist.dev/t/19318 ## Peter MacMillan, 2009-05-12 16:01 Subject: stage/commit issue when checking out a branch Message-ID: URL: https://gitlist.dev/e/d96d20670905120901qa4c0353xc50160f880e17a21%40mail.gmail.com ``` Hello, I've run into a problem where staging changes, checking out a different branch, and then commiting results in an empty commit. Here is a simplified reproduction of the problem: currently using 1.6.3, verified that it works correctly in git version 1.6.1.3. New repo: $ mkdir bug $ cd bug $ git init Initialized empty Git repository in /home/peterm/bug/.git/ New file: $ echo "Hello" > FILE $ git add FILE $ git commit -m "V1" [master (root-commit) 5aeea22] V1 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 FILE Simple change: $ echo "Hello, world." > FILE $ git add FILE Move to a different branch: $ git checkout -b branch M FILE Switched to a new branch 'branch' $ git status # On branch branch # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: FILE # Oh, still on the stage. Great. Commit! $ git commit -m "V2" [branch 818175e] V2 $ git show HEAD commit 818175efc55d2e23871541c5caa2fe771c825b73 Author: Peter MacMillan Date: Tue May 12 11:38:02 2009 -0400 V2 $ git status # On branch branch # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: FILE # Guh? A few of us at the office have hit this and it used to work. The only way to commit the stage is to reset to HEAD, re-add and then commit. Thanks for your help, Peter MacMillan Application Developer, Metavera Solutions Inc. 502-2221 Yonge Street, Toronto, ON, M4S 2B4 416-598-9300 x 27 ``` ## Junio C Hamano, 2009-05-12 16:38 Subject: Re: stage/commit issue when checking out a branch Message-ID: <7v8wl28ef3.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v8wl28ef3.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Sorry; broken as of v1.6.3~60; 83ae209 (checkout branch: prime cache-tree fully, 2009-04-20) is the culprit. ``` ## Junio C Hamano, 2009-05-12 16:56 Subject: [PATCH] Revert "checkout branch: prime cache-tree fully" Message-ID: <7v4ovq8dk7.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4ovq8dk7.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` The logic in 83ae209 (checkout branch: prime cache-tree fully, 2009-04-20) is bogus; checkout can switch branches with a dirty index and in such a case the tree won't match HEAD. Add t2014-switch to catch this breakage. Signed-off-by: Junio C Hamano --- builtin-checkout.c | 9 +-------- t/t2014-switch.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100755 t/t2014-switch.sh diff --git a/builtin-checkout.c b/builtin-checkout.c index 15f0c32..dc4bfb5 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"); diff --git a/t/t2014-switch.sh b/t/t2014-switch.sh new file mode 100755 index 0000000..ccfb147 --- /dev/null +++ b/t/t2014-switch.sh @@ -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 -- 1.6.3.9.g6345d ```