aboutsummaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-10 10:52:21 +0200
committerJunio C Hamano <gitster@pobox.com>2014-07-10 14:06:45 -0700
commite992d1eb39033206dd44143ff28214b837c3d89f (patch)
tree649d3e17694ea502150059fe044be36a59ecb71d /rerere.c
parent81e776d92bb19a4fab12dcc537adfd543468d7d0 (diff)
downloadgit-e992d1eb39033206dd44143ff28214b837c3d89f.tar.gz
git-e992d1eb39033206dd44143ff28214b837c3d89f.tar.xz
use strbuf_addbuf for adding strbufs
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rerere.c b/rerere.c
index d55aa8a01..04d923d8c 100644
--- a/rerere.c
+++ b/rerere.c
@@ -207,11 +207,11 @@ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_siz
strbuf_reset(&one);
strbuf_reset(&two);
} else if (hunk == RR_SIDE_1)
- strbuf_addstr(&one, buf.buf);
+ strbuf_addbuf(&one, &buf);
else if (hunk == RR_ORIGINAL)
; /* discard */
else if (hunk == RR_SIDE_2)
- strbuf_addstr(&two, buf.buf);
+ strbuf_addbuf(&two, &buf);
else
rerere_io_putstr(buf.buf, io);
continue;