From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:42 +0000 (-0700)
Subject: Merge branch 'rs/use-strbuf-addbuf' into maint
X-Git-Tag: v2.9.3~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48aa37ed4266e75340abd3232860d6d14a30c774

Merge branch 'rs/use-strbuf-addbuf' into maint

Code cleanup.

* rs/use-strbuf-addbuf:
strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
use strbuf_addbuf() for appending a strbuf to another
---

48aa37ed4266e75340abd3232860d6d14a30c774
diff --cc wt-status.c
index 4ce4e35ac3,51c0d7fea7..617a284304
--- a/wt-status.c
+++ b/wt-status.c
@@@ -1062,10 -1060,12 +1062,10 @@@ static void abbrev_sha1_in_line(struct 
  			strbuf_addf(split[1], "%s ", abbrev);
  			strbuf_reset(line);
  			for (i = 0; split[i]; i++)
- 				strbuf_addf(line, "%s", split[i]->buf);
+ 				strbuf_addbuf(line, split[i]);
  		}
  	}
 -	for (i = 0; split[i]; i++)
 -		strbuf_release(split[i]);
 -
 +	strbuf_list_free(split);
  }
  
  static void read_rebase_todolist(const char *fname, struct string_list *lines)