Re: [PATCH 4/5] wt-status: don't skip a magical number of characters blindly

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 1, 2015, 17:51 UTC
Message-ID: <xmqq7fm1ip51.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <5634FC48.7070609@web.de>

René Scharfe <l.s.r@web.de> writes:

Show 19 quoted lines

> Use the variable branch_name, which already has "refs/heads/" removed,
> instead of blindly advancing in the ->branch string by 11 bytes.  This
> is safer and less magical.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
>  wt-status.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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.

>  	color_fprintf(s->fp, branch_color_local, "%s", branch_name);