[PATCH 16/16] checkout: drop intimate knowledge of new worktree initial population
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 11, 2015, 00:05 UTC
- Message-ID
- <1436573146-3893-17-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1436573146-3893-1-git-send-email-sunshine@sunshineco.com>
Now that git-worktree no longer relies upon git-checkout to perform initial population of the new worktree, git-checkout no longer needs intimate knowledge that it may be working on a newly created worktree. Therefore, drop 'new_worktree_mode' and the private GIT_CHECKOUT_NEW_WORKTREE environment variable by which git-worktree communicated to git-checkout that it was being invoked to populate a new worktree.
This reverts the remaining changes to checkout.c by 529fef2 (checkout: support checking out into a new working directory, 2014-11-30).
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- builtin/checkout.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 4ae895c..02d78ba 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -48,8 +48,6 @@ struct checkout_opts { const char *prefix; struct pathspec pathspec; struct tree *source_tree; - - int new_worktree_mode; }; static int post_checkout_hook(struct commit *old, struct commit *new, @@ -491,7 +489,7 @@ static int merge_working_tree(const struct checkout_opts *opts, topts.dir->flags |= DIR_SHOW_IGNORED; setup_standard_excludes(topts.dir); } - tree = parse_tree_indirect(old->commit && !opts->new_worktree_mode ? + tree = parse_tree_indirect(old->commit ? old->commit->object.sha1 : EMPTY_TREE_SHA1_BIN); init_tree_desc(&trees[0], tree->buffer, tree->size); @@ -807,8 +805,7 @@ static int switch_branches(const struct checkout_opts *opts, return ret; } - if (!opts->quiet && !old.path && old.commit && - new->commit != old.commit && !opts->new_worktree_mode) + if (!opts->quiet && !old.path && old.commit && new->commit != old.commit) orphaned_commit_warning(old.commit, new->commit); update_refs_for_switch(opts, &old, new); @@ -1151,8 +1148,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, checkout_usage, PARSE_OPT_KEEP_DASHDASH); - opts.new_worktree_mode = getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL; - if (conflict_style) { opts.merge = 1; /* implied */ git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
-- 2.5.0.rc1.201.ga12d9f8