mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
worktree: teach 'remove' to override lock when --force given twice
For consistency with "add -f -f" and "move -f -f" which override the lock on a worktree, allow "remove -f -f" to do so, as well, as a convenience. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
68a6b3a1bd
commit
f4143101cb
|
@ -129,6 +129,7 @@ OPTIONS
|
||||||
twice.
|
twice.
|
||||||
+
|
+
|
||||||
`remove` refuses to remove an unclean working tree unless `--force` is used.
|
`remove` refuses to remove an unclean working tree unless `--force` is used.
|
||||||
|
To remove a locked working tree, specify `--force` twice.
|
||||||
|
|
||||||
-b <new-branch>::
|
-b <new-branch>::
|
||||||
-B <new-branch>::
|
-B <new-branch>::
|
||||||
|
|
|
@ -875,13 +875,13 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
|
||||||
int force = 0;
|
int force = 0;
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
OPT__FORCE(&force,
|
OPT__FORCE(&force,
|
||||||
N_("force removing even if the worktree is dirty"),
|
N_("force removal even if worktree is dirty or locked"),
|
||||||
PARSE_OPT_NOCOMPLETE),
|
PARSE_OPT_NOCOMPLETE),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
struct worktree **worktrees, *wt;
|
struct worktree **worktrees, *wt;
|
||||||
struct strbuf errmsg = STRBUF_INIT;
|
struct strbuf errmsg = STRBUF_INIT;
|
||||||
const char *reason;
|
const char *reason = NULL;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
|
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
|
||||||
|
@ -894,12 +894,13 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
|
||||||
die(_("'%s' is not a working tree"), av[0]);
|
die(_("'%s' is not a working tree"), av[0]);
|
||||||
if (is_main_worktree(wt))
|
if (is_main_worktree(wt))
|
||||||
die(_("'%s' is a main working tree"), av[0]);
|
die(_("'%s' is a main working tree"), av[0]);
|
||||||
reason = is_worktree_locked(wt);
|
if (force < 2)
|
||||||
|
reason = is_worktree_locked(wt);
|
||||||
if (reason) {
|
if (reason) {
|
||||||
if (*reason)
|
if (*reason)
|
||||||
die(_("cannot remove a locked working tree, lock reason: %s"),
|
die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
|
||||||
reason);
|
reason);
|
||||||
die(_("cannot remove a locked working tree"));
|
die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
|
||||||
}
|
}
|
||||||
if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
|
if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
|
||||||
die(_("validation failed, cannot remove working tree: %s"),
|
die(_("validation failed, cannot remove working tree: %s"),
|
||||||
|
|
|
@ -163,4 +163,14 @@ test_expect_success 'proper error when worktree not found' '
|
||||||
done
|
done
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'remove locked worktree (force)' '
|
||||||
|
git worktree add --detach gumby &&
|
||||||
|
test_when_finished "git worktree remove gumby || :" &&
|
||||||
|
git worktree lock gumby &&
|
||||||
|
test_when_finished "git worktree unlock gumby || :" &&
|
||||||
|
test_must_fail git worktree remove gumby &&
|
||||||
|
test_must_fail git worktree remove --force gumby &&
|
||||||
|
git worktree remove --force --force gumby
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue