summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-28 15:54:48 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-28 10:06:46 -0700
commit39743cf554caaed462464b55315ab5b37f5ab1b9 (patch)
treea6bcca9a398c11620f3a1b8e49edc88d88ddd4e6 /git-gui
parentt3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings (diff)
downloadtgif-39743cf554caaed462464b55315ab5b37f5ab1b9.tar.xz
rebase-i: work around Windows CRLF line endings
Editors on Windows can and do save text files with CRLF line endings, which is the convention on the platform. We are seeing reports that the "read" command in a port of bash to the environment however does not strip the CRLF at the end, not adjusting for the same convention on the platform. This breaks the recently added sanity checks for the insn sheet fed to "rebase -i"; instead of an empty line (hence nothing in $command), the script was getting a lone CR in there. Special case a lone CR and treat it the same way as an empty line to work this around. This patch (also) passes the test with Git for Windows, where the issue was seen first. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions