checkout: require worktree unconditionally

diff --git a/builtin/checkout.c b/builtin/checkout.c
index b1e68b3263a0c6b1bfcb3b7db65f20c59600085f..57545543ebcc46ef28ca4a22d399b5476de7af0b 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1218,8 +1218,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 
        opts.new_worktree_mode = getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL;
 
-       setup_work_tree();
-
        if (conflict_style) {
                opts.merge = 1; /* implied */
                git_xmerge_config("merge.conflictstyle", conflict_style, NULL);