From 926ab840cdc867b54fa93b8e1ece2790315c2456 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 6 Jul 2008 02:54:56 -0700 Subject: branch -r -v: do not spit out garbage The codepath to emit relationship between the branch and what it tracks forgot to initialize a string buffer stat[] to empty when showing a tracking branch. This moves the emptying so that the buffer starts as empty and stays so when no information is added to fix this issue. Signed-off-by: Junio C Hamano --- builtin-branch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'builtin-branch.c') diff --git a/builtin-branch.c b/builtin-branch.c index e9423d1e4c..ff71f3d8a6 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -287,10 +287,8 @@ static void fill_tracking_info(char *stat, const char *branch_name) int ours, theirs; struct branch *branch = branch_get(branch_name); - if (!stat_tracking_info(branch, &ours, &theirs) || (!ours && !theirs)) { - stat[0] = '\0'; + if (!stat_tracking_info(branch, &ours, &theirs) || (!ours && !theirs)) return; - } if (!ours) sprintf(stat, "[behind %d] ", theirs); else if (!theirs) @@ -330,6 +328,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, char stat[128]; strbuf_init(&subject, 0); + stat[0] = '\0'; commit = lookup_commit(item->sha1); if (commit && !parse_commit(commit)) { -- cgit v1.2.3