diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 32d81765cb53718e5d26092ccfe970a503edfa02..44bf1d84af574509c5a8f6f05721d7c4f9719439 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -213,5 +213,19 @@ EOF
git checkout master
'
+test_expect_success 'status --branch with detached HEAD' '
+ git reset --hard &&
+ git checkout master^0 &&
+ git status --branch --porcelain >actual &&
+ cat >expected <<-EOF &&
+ ## HEAD (no branch)
+ ?? .gitconfig
+ ?? actual
+ ?? expect
+ ?? expected
+ ?? mdconflict/
+ EOF
+ test_i18ncmp expected actual
+'
test_done
diff --git a/wt-status.c b/wt-status.c
index 3e3b8c098924d655bccb395e95cee832abb1d39f..435fc2806ec0a59acf390ee89ed2efc79f229a0e 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -897,15 +897,15 @@ static void wt_status_print_verbose(struct wt_status *s)
static void wt_status_print_tracking(struct wt_status *s)
{
struct strbuf sb = STRBUF_INIT;
- const char *cp, *ep;
+ const char *cp, *ep, *branch_name;
struct branch *branch;
char comment_line_string[3];
int i;
assert(s->branch && !s->is_initial);
- if (!starts_with(s->branch, "refs/heads/"))
+ if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
return;
- branch = branch_get(s->branch + 11);
+ branch = branch_get(branch_name);
if (!format_tracking_info(branch, &sb))
return;
@@ -1268,6 +1268,7 @@ static char *read_and_strip_branch(const char *path)
{
struct strbuf sb = STRBUF_INIT;
unsigned char sha1[20];
+ const char *branch_name;
if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
goto got_nothing;
@@ -1276,8 +1277,8 @@ static char *read_and_strip_branch(const char *path)
strbuf_setlen(&sb, sb.len - 1);
if (!sb.len)
goto got_nothing;
- if (starts_with(sb.buf, "refs/heads/"))
- strbuf_remove(&sb,0, strlen("refs/heads/"));
+ if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
+ strbuf_remove(&sb, 0, branch_name - sb.buf);
else if (starts_with(sb.buf, "refs/"))
;
else if (!get_sha1_hex(sb.buf, sha1)) {
@@ -1308,9 +1309,8 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
struct grab_1st_switch_cbdata *cb = cb_data;
const char *target = NULL, *end;
- if (!starts_with(message, "checkout: moving from "))
+ if (!skip_prefix(message, "checkout: moving from ", &message))
return 0;
- message += strlen("checkout: moving from ");
target = strstr(message, " to ");
if (!target)
return 0;
@@ -1348,14 +1348,10 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
/* perhaps sha1 is a tag, try to dereference to a commit */
((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
!hashcmp(cb.nsha1, commit->object.sha1)))) {
- int ofs;
- if (starts_with(ref, "refs/tags/"))
- ofs = strlen("refs/tags/");
- else if (starts_with(ref, "refs/remotes/"))
- ofs = strlen("refs/remotes/");
- else
- ofs = 0;
- state->detached_from = xstrdup(ref + ofs);
+ const char *from = ref;
+ if (!skip_prefix(from, "refs/tags/", &from))
+ skip_prefix(from, "refs/remotes/", &from);
+ state->detached_from = xstrdup(from);
} else
state->detached_from =
xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
@@ -1442,9 +1438,7 @@ void wt_status_print(struct wt_status *s)
if (s->branch) {
const char *on_what = _("On branch ");
const char *branch_name = s->branch;
- if (starts_with(branch_name, "refs/heads/"))
- branch_name += 11;
- else if (!strcmp(branch_name, "HEAD")) {
+ if (!strcmp(branch_name, "HEAD")) {
branch_status_color = color(WT_STATUS_NOBRANCH, s);
if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
if (state.rebase_interactive_in_progress)
@@ -1462,7 +1456,8 @@ void wt_status_print(struct wt_status *s)
branch_name = "";
on_what = _("Not currently on any branch.");
}
- }
+ } else
+ skip_prefix(branch_name, "refs/heads/", &branch_name);
status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
status_printf_more(s, branch_status_color, "%s", on_what);
status_printf_more(s, branch_color, "%s\n", branch_name);
@@ -1644,24 +1639,24 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
return;
branch_name = s->branch;
- if (starts_with(branch_name, "refs/heads/"))
- branch_name += 11;
- else if (!strcmp(branch_name, "HEAD")) {
- branch_name = _("HEAD (no branch)");
- branch_color_local = color(WT_STATUS_NOBRANCH, s);
- }
-
- branch = branch_get(s->branch + 11);
if (s->is_initial)
color_fprintf(s->fp, header_color, _("Initial commit on "));
+ if (!strcmp(s->branch, "HEAD")) {
+ color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
+ _("HEAD (no branch)"));
+ goto conclude;
+ }
+
+ skip_prefix(branch_name, "refs/heads/", &branch_name);
+
+ branch = branch_get(branch_name);
+
color_fprintf(s->fp, branch_color_local, "%s", branch_name);
if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
- if (!base) {
- fputc(s->null_termination ? '\0' : '\n', s->fp);
- return;
- }
+ if (!base)
+ goto conclude;
upstream_is_gone = 1;
}
@@ -1671,10 +1666,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_remote, "%s", base);
free((char *)base);
- if (!upstream_is_gone && !num_ours && !num_theirs) {
- fputc(s->null_termination ? '\0' : '\n', s->fp);
- return;
- }
+ if (!upstream_is_gone && !num_ours && !num_theirs)
+ goto conclude;
#define LABEL(string) (s->no_gettext ? (string) : _(string))
@@ -1695,6 +1688,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
}
color_fprintf(s->fp, header_color, "]");
+ conclude:
fputc(s->null_termination ? '\0' : '\n', s->fp);
}