From: Junio C Hamano Date: Sun, 01 Nov 2015 17:55:50 GMT Subject: Re: [PATCH 4/5] wt-status: don't skip a magical number of characters blindly Message-ID: In-Reply-To: Junio C Hamano writes: >> diff --git a/wt-status.c b/wt-status.c >> index e206cc9..42ea15e 100644 >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1656,7 +1656,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) >> if (starts_with(branch_name, "refs/heads/")) >> branch_name += 11; >> >> - branch = branch_get(s->branch + 11); >> + branch = branch_get(branch_name); > > Is this correct? s->branch is the refname that is l10n independent; > branch_name is the localized variant for human consumption. Ahh, and that convention has been changed at patch 3/5. Now the only localizable string "HEAD (no branch)" never goes into that variable thanks to the code reorganization in 3/5, this variable is used only to give us a shortened refname. OK, I misread the code. The result is correct.