From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2007 07:52:47 +0000 (-0700)
Subject: Merge branch 'ph/strbuf' into kh/commit
X-Git-Tag: v1.5.4-rc0~295^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a17ba31b0b75365e1245e494d46abae4afc57480;p=git.git

Merge branch 'ph/strbuf' into kh/commit

* ph/strbuf:
  Clean up stripspace a bit, use strbuf even more.
  Add strbuf_read_file().
  rerere: Fix use of an empty strbuf.buf
  Small cache_tree_write refactor.
  Make builtin-rerere use of strbuf nicer and more efficient.
  Add strbuf_cmp.
  strbuf_setlen(): do not barf on setting length of an empty buffer to 0
  sq_quote_argv and add_to_string rework with strbuf's.
  Full rework of quote_c_style and write_name_quoted.
  Rework unquote_c_style to work on a strbuf.
  strbuf API additions and enhancements.
  nfv?asprintf are broken without va_copy, workaround them.
  Fix the expansion pattern of the pseudo-static path buffer.
---

a17ba31b0b75365e1245e494d46abae4afc57480