summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-28 20:52:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-15 18:35:07 (GMT)
commit1536dd9c1df0b7167b139f6666080cc4774ef63f (patch)
treeaae207d7fb80f2f95c0159c72309971caac9cbc5
parentb42ca3dd0f157d0c23c9a034bc68257e1748238a (diff)
downloadgit-1536dd9c1df0b7167b139f6666080cc4774ef63f.zip
git-1536dd9c1df0b7167b139f6666080cc4774ef63f.tar.gz
git-1536dd9c1df0b7167b139f6666080cc4774ef63f.tar.bz2
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>
-rw-r--r--builtin/column.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/column.c b/builtin/column.c
index 40eab08..33314b4 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);