checkout: drop intimate knowledge of newly created worktree
Now that git-worktree no longer relies upon git-checkout for new branch creation, new worktree HEAD set up, or initial worktree population, git-checkout no longer needs intimate knowledge that it may be operating in 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 manipulate 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 17, 2015 at 19:00 UTC
272be14a85d3a8dca2ca842a3f35dfcf5895d2a6
1 file changed
+2
-7
builtin/checkout.c
+2
-7
@@ -48,8 +48,6 @@ struct checkout_opts {
48
const char *prefix;
49
struct pathspec pathspec;
50
struct tree *source_tree;
51
-
52
- int new_worktree_mode;
51
};
52
53
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,
489
topts.dir->flags |= DIR_SHOW_IGNORED;
490
setup_standard_excludes(topts.dir);
491
}
494
- tree = parse_tree_indirect(old->commit && !opts->new_worktree_mode ?
492
+ tree = parse_tree_indirect(old->commit ?
493
old->commit->object.sha1 :
494
EMPTY_TREE_SHA1_BIN);
495
init_tree_desc(&trees[0], tree->buffer, tree->size);
@@ -807,8 +805,7 @@ static int switch_branches(const struct checkout_opts *opts,
805
return ret;
806
}
807
810
- if (!opts->quiet && !old.path && old.commit &&
811
- new->commit != old.commit && !opts->new_worktree_mode)
808
+ if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
809
orphaned_commit_warning(old.commit, new->commit);
810
811
update_refs_for_switch(opts, &old, new);
@@ -1151,8 +1148,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
1148
argc = parse_options(argc, argv, prefix, options, checkout_usage,
1149
PARSE_OPT_KEEP_DASHDASH);
1150
1154
- opts.new_worktree_mode = getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL;
1155
-
1151
if (conflict_style) {
1152
opts.merge = 1; /* implied */
1153
git_xmerge_config("merge.conflictstyle", conflict_style, NULL);