summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:33:09 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:33:09 -0700
commit1fc83452c76e65385b3da69ea94eb957e36e6c78 (patch)
tree6d6105b9a9fed643036df3d0fceabde1ab1479c7 /rerere.c
parentf357797678aa5ae35c63623b8b76eb682d5b9b79 (diff)
parent9d02150cf4d833935161ef265e4dc03807caa800 (diff)
downloadgit-1fc83452c76e65385b3da69ea94eb957e36e6c78.tar.gz
Merge branch 'rs/code-cleaning'
* rs/code-cleaning: fsck: simplify fsck_commit_buffer() by using commit_list_count() commit: use commit_list_append() instead of duplicating its code merge: simplify merge_trivial() by using commit_list_append() use strbuf_addch for adding single characters use strbuf_addbuf for adding strbufs
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 ffc6a5b168..d84b495895 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;