From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2016 21:13:47 +0000 (-0700)
Subject: Merge branch 'rs/use-strbuf-addbuf'
X-Git-Tag: v2.10.0-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b4e8a847ba4e775fb7d422b2daf18356db50eec8?ds=inline;hp=--cc

Merge branch 'rs/use-strbuf-addbuf'

Code cleanup.

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

b4e8a847ba4e775fb7d422b2daf18356db50eec8
diff --cc wt-status.c
index de62ab2149,51c0d7fea7..19cbc3939c
--- a/wt-status.c
+++ b/wt-status.c
@@@ -1063,10 -1060,12 +1063,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)