Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:07:08

René Scharfe [off-list ref] writes:
quoted hunk
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 <redacted>
---
 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);
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help