From: René Scharfe <l.s.r@web.de>
Date: Sat, 31 Oct 2015 17:37:12 +0000 (+0100)
Subject: wt-status: don't skip a magical number of characters blindly
X-Git-Tag: v2.6.3~2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d8325f8ee3ef187a22743ccbedb978e52e3d095?hp=--cc

wt-status: don't skip a magical number of characters blindly

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

8d8325f8ee3ef187a22743ccbedb978e52e3d095
diff --git a/wt-status.c b/wt-status.c
index 0e4a04e695..ca6811118c 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1533,7 +1533,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);
 
 	color_fprintf(s->fp, branch_color_local, "%s", branch_name);