summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-28 20:36:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-15 18:35:06 (GMT)
commit692dfdfa622c6286999609a4fef59724124ca794 (patch)
treeb9f9e221a14aca27b7e8723d1fdbcace95ae20fa /builtin/merge-recursive.c
parent3f163962282d2d8bea914c32d81ad38544044f78 (diff)
downloadgit-692dfdfa622c6286999609a4fef59724124ca794.zip
git-692dfdfa622c6286999609a4fef59724124ca794.tar.gz
git-692dfdfa622c6286999609a4fef59724124ca794.tar.bz2
transport-helper: read helper response with strbuf_getline()
Our implementation of helpers never use CRLF line endings, and they do not depend on the ability to place a CR as payload at the end of the line, so this is essentially a no-op for in-tree users. However, this allows third-party implementation of helpers to give us their line with CRLF line ending (they cannot expect us to feed CRLF to them, though). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions