print_current_branch_name() tries to resolve HEAD and die() when it doesn't resolve it successfully. But the conditions being tested are always unreachable because early in branch:cmd_branch() the same logic is performed.
Eliminate the duplicate and unreachable code, and update the current logic to the more reliable check for the detached head. Signed-off-by: Rafael Ascensão <rafa.al...@gmail.com> --- This patch is meant to be either applied or squashed on top of the current series. I am basing the claims of it being more reliable of what Junio suggested on a previous iteration of this series: https://public-inbox.org/git/xmqq4ldtgehs....@gitster-ct.c.googlers.com/ But the main goal of this patch is to just bring some attention to this, as I mentioned it in a previous thread but it got lost. After asking on #git-devel, the suggestion was to send it as an incremental patch. So here it is. :) I still think the mention about scripting should be removed from the original commit message, leaving it open to being taught other tricks like --verbose that aren't necessarily script-friendly. Cheers builtin/branch.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 46f91dc06d..1c51d0a8ca 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -38,6 +38,7 @@ static const char * const builtin_branch_usage[] = { static const char *head; static struct object_id head_oid; +static int head_flags = 0; static int branch_use_color = -1; static char branch_colors[][COLOR_MAXLEN] = { @@ -443,21 +444,6 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin free(to_free); } -static void print_current_branch_name(void) -{ - int flags; - const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, &flags); - const char *shortname; - if (!refname) - die(_("could not resolve HEAD")); - else if (!(flags & REF_ISSYMREF)) - return; - else if (skip_prefix(refname, "refs/heads/", &shortname)) - puts(shortname); - else - die(_("HEAD (%s) points outside of refs/heads/"), refname); -} - static void reject_rebase_or_bisect_branch(const char *target) { struct worktree **worktrees = get_worktrees(0); @@ -668,10 +654,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix) track = git_branch_track; - head = resolve_refdup("HEAD", 0, &head_oid, NULL); + head = resolve_refdup("HEAD", 0, &head_oid, &head_flags); if (!head) die(_("Failed to resolve HEAD as a valid ref.")); - if (!strcmp(head, "HEAD")) + if (!(head_flags & REF_ISSYMREF)) filter.detached = 1; else if (!skip_prefix(head, "refs/heads/", &head)) die(_("HEAD not found below refs/heads!")); @@ -716,7 +702,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) die(_("branch name required")); return delete_branches(argc, argv, delete > 1, filter.kind, quiet); } else if (show_current) { - print_current_branch_name(); + if (!filter.detached) + puts(head); return 0; } else if (list) { /* git branch --local also shows HEAD when it is detached */ -- 2.19.1
