development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 03:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

checkout: name check_linked_checkouts() more meaningfully

Browse source 
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:
Eric Sunshine 2015-07-17 18:59:57 -04:00 committed by Junio C Hamano
parent c265c533cf
commit e13d37094e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/checkout.c
View file

@ -910,7 +910,7 @@ static void check_linked_checkout(struct branch_info *new, const char *id)
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);
}