зеркало из https://github.com/microsoft/git.git
checkout: name check_linked_checkouts() more meaningfully
check_linked_checkouts() doesn't just "check" linked checkouts for "something"; specifically, it aborts the operation if the branch about to be checked out is already checked out elsewhere. Therefore, rename it to die_if_checked_out() to give a better indication of its function. The more meaningful name will be particularly important when this function is later published for use by other callers. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c265c533cf
Коммит
e13d37094e
|
@ -910,7 +910,7 @@ done:
|
|||
strbuf_release(&gitdir);
|
||||
}
|
||||
|
||||
static void check_linked_checkouts(struct branch_info *new)
|
||||
static void die_if_checked_out(struct branch_info *new)
|
||||
{
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
DIR *dir;
|
||||
|
@ -1152,7 +1152,7 @@ static int checkout_branch(struct checkout_opts *opts,
|
|||
char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
|
||||
if (head_ref &&
|
||||
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
|
||||
check_linked_checkouts(new);
|
||||
die_if_checked_out(new);
|
||||
free(head_ref);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче