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>
This commit is contained in:
parent
ed197a6ab9
commit
1c56190aec
@ -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_DIR_ENVIRONMENT, sb_git.buf);
|
||||||
argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
|
argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
|
||||||
memset(&cp, 0, sizeof(cp));
|
memset(&cp, 0, sizeof(cp));
|
||||||
@ -285,7 +284,7 @@ static int add_worktree(const char *path, const char *refname,
|
|||||||
|
|
||||||
cp.argv = NULL;
|
cp.argv = NULL;
|
||||||
argv_array_clear(&cp.args);
|
argv_array_clear(&cp.args);
|
||||||
argv_array_push(&cp.args, "checkout");
|
argv_array_pushl(&cp.args, "reset", "--hard", NULL);
|
||||||
cp.env = child_env.argv;
|
cp.env = child_env.argv;
|
||||||
ret = run_command(&cp);
|
ret = run_command(&cp);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
Loading…
Reference in New Issue
Block a user