worktree: populate via "git reset --hard" rather than "git checkout"

Now that git-worktree handles all functionality (--force, --detach,
-b/-B) previously delegated to git-checkout, actual population of the
new worktree can be accomplished more directly and lightweight with
"git reset --hard" in place of "git checkout".

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 461930858b5e8a2dd1d6243d1f1a08bba096783c..5d9371cf950cc1cc2201fe2aefc6d7111264eb27 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -266,7 +266,6 @@ static int add_worktree(const char *path, const char *refname,
 
        fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
 
 
        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));
        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 +284,7 @@ static int add_worktree(const char *path, const char *refname,
 
        cp.argv = NULL;
        argv_array_clear(&cp.args);
 
        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) {
        cp.env = child_env.argv;
        ret = run_command(&cp);
        if (!ret) {