undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: drop 'checkout_opts' dependency from prepare_linked_checkout

Browse Source 
The plan is to relocate "git checkout --to" functionality to "git
worktree add", however, worktree.c won't have access to the 'struct
checkout_opts' passed to prepare_linked_worktree(), which it consults
for the pathname of the new worktree and the argv[] of the command it
should run to populate the new worktree. Facilitate relocation of
prepare_linked_worktree() by instead having it accept the pathname and
argv[] directly, thus eliminating the final references to 'struct
checkout_opts'.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2015-07-06 13:30:49 -04:00 committed by Junio C Hamano
parent 338dfd0da4
commit bdf0f375b9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/checkout.c
View File

@ -854,11 +854,11 @@ static void remove_junk_on_signal(int signo)
raise(signo); raise(signo);
} }
static int prepare_linked_checkout(const struct checkout_opts *opts) static int prepare_linked_checkout(const char *path, const char **child_argv)
{ {
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
const char *path = opts->new_worktree, *name; const char *name;
struct stat st; struct stat st;
struct child_process cp; struct child_process cp;
int counter = 0, len, ret; int counter = 0, len, ret;
@ -943,7 +943,7 @@ static int prepare_linked_checkout(const struct checkout_opts *opts)
setenv(GIT_WORK_TREE_ENVIRONMENT, path, 1); setenv(GIT_WORK_TREE_ENVIRONMENT, path, 1);
memset(&cp, 0, sizeof(cp)); memset(&cp, 0, sizeof(cp));
cp.git_cmd = 1; cp.git_cmd = 1;
cp.argv = opts->saved_argv; cp.argv = child_argv;
ret = run_command(&cp); ret = run_command(&cp);
if (!ret) { if (!ret) {
is_junk = 0; is_junk = 0;
@ -1302,7 +1302,8 @@ static int checkout_branch(struct checkout_opts *opts,
if (opts->new_worktree) { if (opts->new_worktree) {
if (!new->commit) if (!new->commit)
die(_("no branch specified")); die(_("no branch specified"));
return prepare_linked_checkout(opts); return prepare_linked_checkout(opts->new_worktree,
opts->saved_argv);
} }
if (!new->commit && opts->new_branch) { if (!new->commit && opts->new_branch) {