Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index d2ebaf1f5857bbcc5f2a802472824a75ce5d5ccf..54db1184a003897294b6aaa46bc6bf29faa919bc 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -401,7 +401,7 @@ static int batch_objects(struct batch_options *opt)
        save_warning = warn_on_object_refname_ambiguity;
        warn_on_object_refname_ambiguity = 0;
 
-       while (strbuf_getline_lf(&buf, stdin) != EOF) {
+       while (strbuf_getline(&buf, stdin) != EOF) {
                if (data.split_on_whitespace) {
                        /*
                         * Split at first whitespace, tying off the beginning