diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-23 21:54:29 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 21:54:29 (GMT) |
commit | 352d72a30e3d113064ebc194f49560eeae34b332 (patch) | |
tree | 3e2f020592c95eab2e160ff2e1984525ce3e7638 /builtin/checkout.c | |
parent | 9ce2824e4ba56bf0f2017a0e351fa35c22a705ac (diff) | |
parent | 14ace5b77b493506a1f8ffde96a2f49cc7bc4db0 (diff) | |
download | git-352d72a30e3d113064ebc194f49560eeae34b332.zip git-352d72a30e3d113064ebc194f49560eeae34b332.tar.gz git-352d72a30e3d113064ebc194f49560eeae34b332.tar.bz2 |
Merge branch 'nd/worktree-various-heads'
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
* nd/worktree-various-heads:
branch: do not rename a branch under bisect or rebase
worktree.c: check whether branch is bisected in another worktree
wt-status.c: split bisect detection out of wt_status_get_state()
worktree.c: check whether branch is rebased in another worktree
worktree.c: avoid referencing to worktrees[i] multiple times
wt-status.c: make wt_status_check_rebase() work on any worktree
wt-status.c: split rebase detection out of wt_status_get_state()
path.c: refactor and add worktree_git_path()
worktree.c: mark current worktree
worktree.c: make find_shared_symref() return struct worktree *
worktree.c: store "id" instead of "git_dir"
path.c: add git_common_path() and strbuf_git_common_path()
dir.c: rename str(n)cmp_icase to fspath(n)cmp
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index ea2fe1c..3398c61 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1110,7 +1110,7 @@ static int checkout_branch(struct checkout_opts *opts, char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag); if (head_ref && (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path))) - die_if_checked_out(new->path); + die_if_checked_out(new->path, 1); free(head_ref); } |