[PATCH 05/16] checkout: generalize die_if_checked_out() branch name argument
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 11, 2015, 00:05 UTC
- Message-ID
- <1436573146-3893-6-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1436573146-3893-1-git-send-email-sunshine@sunshineco.com>
The plan is to publish die_if_checked_out() so that callers other than git-checkout can take advantage of it, however, those callers won't have access to git-checkout's "struct branch_info". Therefore, change it to accept the full name of the branch as a simple string instead.
While here, also give the argument a more meaningful name ("branch" instead of "new").
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- builtin/checkout.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index ee33a20..673daa0 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -873,7 +873,7 @@ static const char *unique_tracking_name(const char *name, unsigned char *sha1) return NULL; } -static void check_linked_checkout(struct branch_info *new, const char *id) +static void check_linked_checkout(const char *branch, const char *id) { struct strbuf sb = STRBUF_INIT; struct strbuf path = STRBUF_INIT; @@ -893,7 +893,7 @@ static void check_linked_checkout(struct branch_info *new, const char *id) end = start; while (*end && !isspace(*end)) end++; - if (strncmp(start, new->path, end - start) || new->path[end - start] != '\0') + if (strncmp(start, branch, end - start) || branch[end - start] != '\0') goto done; if (id) { strbuf_reset(&path); @@ -903,14 +903,15 @@ static void check_linked_checkout(struct branch_info *new, const char *id) strbuf_rtrim(&gitdir); } else strbuf_addstr(&gitdir, get_git_common_dir()); - die(_("'%s' is already checked out at '%s'"), new->name, gitdir.buf); + skip_prefix(branch, "refs/heads/", &branch); + die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf); done: strbuf_release(&path); strbuf_release(&sb); strbuf_release(&gitdir); } -static void die_if_checked_out(struct branch_info *new) +static void die_if_checked_out(const char *branch) { struct strbuf path = STRBUF_INIT; DIR *dir; @@ -921,7 +922,7 @@ static void die_if_checked_out(struct branch_info *new) * $GIT_DIR so resolve_ref_unsafe() won't work (it * uses git_path). Parse the ref ourselves. */ - check_linked_checkout(new, NULL); + check_linked_checkout(branch, NULL); strbuf_addf(&path, "%s/worktrees", get_git_common_dir()); dir = opendir(path.buf); @@ -932,7 +933,7 @@ static void die_if_checked_out(struct branch_info *new) while ((d = readdir(dir)) != NULL) { if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue; - check_linked_checkout(new, d->d_name); + check_linked_checkout(branch, d->d_name); } closedir(dir); } @@ -1151,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))) - die_if_checked_out(new); + die_if_checked_out(new->path); free(head_ref); }
-- 2.5.0.rc1.201.ga12d9f8