Merge branch 'jk/negative-hiderefs'

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 461930858b5e8a2dd1d6243d1f1a08bba096783c..430b51e7a74bb28ac1532ac836e9770121977096 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -7,6 +7,7 @@
 #include "refs.h"
 #include "run-command.h"
 #include "sigchain.h"
+#include "refs.h"
 
 static const char * const worktree_usage[] = {
        N_("git worktree add [<options>] <path> <branch>"),
@@ -266,7 +267,6 @@ static int add_worktree(const char *path, const char *refname,
 
        fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
 
-       setenv("GIT_CHECKOUT_NEW_WORKTREE", "1", 1);
        argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
        argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
        memset(&cp, 0, sizeof(cp));
@@ -285,7 +285,7 @@ static int add_worktree(const char *path, const char *refname,
 
        cp.argv = NULL;
        argv_array_clear(&cp.args);
-       argv_array_push(&cp.args, "checkout");
+       argv_array_pushl(&cp.args, "reset", "--hard", NULL);
        cp.env = child_env.argv;
        ret = run_command(&cp);
        if (!ret) {