summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Ross Kabus <rkabus@aerotech.com>2017-09-07 10:41:11 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-10 16:29:53 +0900
commitc818e743325e5710dbf2071b769fbcbc3b50a9e0 (patch)
tree0ef3e0b07d169a776006b4ef6dfdfd192a78aeee /builtin/merge.c
parentPrepare for 2.14.2 (diff)
downloadtgif-c818e743325e5710dbf2071b769fbcbc3b50a9e0.tar.xz
commit-tree: do not complete line in -F input
"git commit-tree -F <file>", unlike "cat <file> | git commit-tree" (i.e. feeding the same contents from the standard input), added a missing final newline when the input ended in an incomplete line. Correct this inconsistency by leaving the incomplete line as-is, as erring on the side of not touching the input is preferrable and expected for a plumbing command like "commit-tree". Signed-off-by: Ross Kabus <rkabus@aerotech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions