diff options
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -334,12 +334,12 @@ void remove_branch_state(void) unlink(git_path_squash_msg()); } -void die_if_checked_out(const char *branch) +void die_if_checked_out(const char *branch, int ignore_current_worktree) { const struct worktree *wt; wt = find_shared_symref("HEAD", branch); - if (!wt) + if (!wt || (ignore_current_worktree && wt->is_current)) return; skip_prefix(branch, "refs/heads/", &branch); die(_("'%s' is already checked out at '%s'"), |