diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:43:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:43:09 -0800 |
commit | 886932e2816ba8554ba0bf6c2c91fdfa6877dd65 (patch) | |
tree | 6bb246782bf8857db0e937aba059eb83ef4ccbfe | |
parent | Merge branch 'mm/conflict-advice' (diff) | |
parent | strbuf_addbuf(): allow passing the same buf to dst and src (diff) | |
download | tgif-886932e2816ba8554ba0bf6c2c91fdfa6877dd65.tar.xz |
Merge branch 'jc/maint-strbuf-add-fix-doubling'
* jc/maint-strbuf-add-fix-doubling:
strbuf_addbuf(): allow passing the same buf to dst and src
-rw-r--r-- | strbuf.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -104,6 +104,7 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) { strbuf_add(sb, s, strlen(s)); } static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) { + strbuf_grow(sb, sb2->len); strbuf_add(sb, sb2->buf, sb2->len); } extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len); |