зеркало из https://github.com/microsoft/git.git
checkout: relocate --to's "no branch specified" check
The plan is to relocate "git checkout --to" functionality to "git worktree add", however, this check expects a 'struct branch_info' which git-worktree won't have at hand. It will, however, have access to its own command-line from which it can pick up the branch name. Therefore, as a preparatory step, rather than having prepare_linked_checkout() perform this check, make it the caller's responsibility. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c990a4c11d
Коммит
9559ce8368
|
@ -865,8 +865,6 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,
|
|||
int counter = 0, len, ret;
|
||||
unsigned char rev[20];
|
||||
|
||||
if (!new->commit)
|
||||
die(_("no branch specified"));
|
||||
if (file_exists(path) && !is_empty_dir(path))
|
||||
die(_("'%s' already exists"), path);
|
||||
|
||||
|
@ -1303,8 +1301,11 @@ static int checkout_branch(struct checkout_opts *opts,
|
|||
free(head_ref);
|
||||
}
|
||||
|
||||
if (opts->new_worktree)
|
||||
if (opts->new_worktree) {
|
||||
if (!new->commit)
|
||||
die(_("no branch specified"));
|
||||
return prepare_linked_checkout(opts, new);
|
||||
}
|
||||
|
||||
if (!new->commit && opts->new_branch) {
|
||||
unsigned char rev[20];
|
||||
|
|
Загрузка…
Ссылка в новой задаче