From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:43:09 +0000 (-0800)
Subject: Merge branch 'jc/maint-strbuf-add-fix-doubling'
X-Git-Tag: v1.7.0-rc0~65
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/886932e2816ba8554ba0bf6c2c91fdfa6877dd65?hp=-c

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
---

886932e2816ba8554ba0bf6c2c91fdfa6877dd65
diff --combined strbuf.h
index 8ce2a2e54b,4971743a24..fac2dbc24f
--- a/strbuf.h
+++ b/strbuf.h
@@@ -81,6 -81,7 +81,6 @@@ extern void strbuf_trim(struct strbuf *
  extern void strbuf_rtrim(struct strbuf *);
  extern void strbuf_ltrim(struct strbuf *);
  extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);
 -extern void strbuf_tolower(struct strbuf *);
  
  extern struct strbuf **strbuf_split(const struct strbuf *, int delim);
  extern void strbuf_list_free(struct strbuf **);
@@@ -104,6 -105,7 +104,7 @@@ static inline void strbuf_addstr(struc
  	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);
@@@ -115,7 -117,6 +116,7 @@@ struct strbuf_expand_dict_entry 
  	const char *value;
  };
  extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);
 +extern void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
  
  __attribute__((format (printf,2,3)))
  extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);