From 1536dd9c1df0b7167b139f6666080cc4774ef63f Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Oct 2015 13:52:11 -0700
Subject: [PATCH] column: read lines with strbuf_getline()
Multiple lines read here are concatenated on a single line to form a
multi-column output line. We do not want to have a CR at the end,
even if the input file consists of CRLF terminated lines.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/column.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/column.c b/builtin/column.c
index 40eab085946..33314b4d712 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -51,7 +51,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
die(_("--command must be the first argument"));
}
finalize_colopts(&colopts, -1);
- while (!strbuf_getline_lf(&sb, stdin))
+ while (!strbuf_getline(&sb, stdin))
string_list_append(&list, sb.buf);
print_columns(&list, colopts, &copts);