diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 19:52:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 22:16:50 (GMT) |
| commit | fa7b3c2f752a10a5dca9989d4a1c4b93ffa7f943 (patch) | |
| tree | 4d11b9d9ecba11077d0db6a837e9a069d2581323 /builtin-read-tree.c | |
| parent | 0d641f75d1237b34d3cfb411a18c813cfacb4726 (diff) | |
| download | git-fa7b3c2f752a10a5dca9989d4a1c4b93ffa7f943.zip git-fa7b3c2f752a10a5dca9989d4a1c4b93ffa7f943.tar.gz git-fa7b3c2f752a10a5dca9989d4a1c4b93ffa7f943.tar.bz2 | |
checkout: Fix "initial checkout" detection
Earlier commit 5521883 (checkout: do not lose staged removal, 2008-09-07)
tightened the rule to prevent switching branches from losing local
changes, so that staged removal of paths can be protected, while
attempting to keep a loophole to still allow a special case of switching
out of an un-checked-out state.
However, the loophole was made a bit too tight, and did not allow
switching from one branch (in an un-checked-out state) to check out
another branch.
The change to builtin-checkout.c in this commit loosens it to allow this,
by not insisting the original commit and the new commit to be the same.
It also introduces a new function, is_index_unborn (and an associated
macro, is_cache_unborn), to check if the repository is truly in an
un-checked-out state more reliably, by making sure that $GIT_INDEX_FILE
did not exist when populating the in-core index structure. A few places
the earlier commit 5521883 added the check for the initial checkout
condition are updated to use this function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 0706c95..38fef34 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -206,7 +206,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) break; case 2: opts.fn = twoway_merge; - opts.initial_checkout = !active_nr; + opts.initial_checkout = is_cache_unborn(); break; case 3: default: |