summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-10-21 14:24:46 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-21 09:32:34 -0700
commit6307041dd2ca2f3507dc2791a1824d72302b0081 (patch)
tree8a23738830f59531827b0e8d0d50fac783c61453 /ll-merge.h
parentsequencer: completely revamp the "todo" script parsing (diff)
downloadtgif-6307041dd2ca2f3507dc2791a1824d72302b0081.tar.xz
sequencer: strip CR from the todo script
It is not unheard of that editors on Windows write CR/LF even if the file originally had only LF. This is particularly awkward for exec lines of a rebase -i todo sheet. Take for example the insn "exec echo": The shell script parser splits at the LF and leaves the CR attached to "echo", which leads to the unknown command "echo\r". Work around that by stripping CR when reading the todo commands, as we already do for LF. This happens to fix t9903.14 and .15 in MSYS1 environments (with the rebase--helper patches based on this patch series): the todo script constructed in such a setup contains CR/LF thanks to MSYS1 runtime's cleverness. Based on a report and a patch by Johannes Sixt. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions