From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 28 Oct 2015 14:54:21 +0000 (+0100)
Subject: t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
X-Git-Tag: v2.6.3~26^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1db25aae5ef7c518b46a9f5b30f317e882ac505a;p=thirdparty%2Fgit.git

t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

Based on a bug report by Chad Boles.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 88d7d5358a..65474dc13a 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1240,4 +1240,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