git-am: propagate --3way options as well

diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 3fba6b9e743545868368a0e554466fca3814316a..30d00a66649f749c8cf6e657734045382bc29e13 100644 (file)
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -189,9 +189,8 @@ static int batch_one_object(const char *obj_name, int print_contents)
 
 static int batch_objects(int print_contents)
 {
-       struct strbuf buf;
+       struct strbuf buf = STRBUF_INIT;
 
-       strbuf_init(&buf, 0);
        while (strbuf_getline(&buf, stdin, '\n') != EOF) {
                int error = batch_one_object(buf.buf, print_contents);
                if (error)