From: Johannes Schindelin Date: Wed, 28 Oct 2015 14:54:21 GMT Subject: [PATCH v4 1/2] Demonstrate rebase fails when the editor saves with CR/LF Message-ID: <3d37a1348065d5902c829481db2124a52be0ca1a.1446043983.git.johannes.schindelin@gmx.de> In-Reply-To: Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1261,4 +1261,16 @@ test_expect_success 'static check of bad SHA-1' ' test E = $(git cat-file commit HEAD | sed -ne \$p) ' +test_expect_failure 'editor saves as CR/LF' ' + git checkout -b with-crlf && + write_script add-crs.sh <<-\EOF && + sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new && + mv -f "$1".new "$1" + EOF + ( + test_set_editor "$(pwd)/add-crs.sh" && + git rebase -i HEAD^ + ) +' + test_done -- 2.1.4