From 51da7a909f546cc0ae00a6259c8a3cd019e8e42a Mon Sep 17 00:00:00 2001
From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 27 Sep 2010 08:01:35 -0400
Subject: [PATCH] Side-step line-ending corruption leading to t3032 failures.

By default, MSYS grep and sed throw away CR from CRLF line-endings.
Tests t3032.4 through t3032.8 employ grep and fail due to this behavior.
Test t3032.9 employs sed and fails. Fix by employing grep's -U/--binary
and sed's -b/--binary switches to suppress the default behavior of
dropping CR characters.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 t/t3032-merge-recursive-options.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 2293797553..03ea961720 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -13,9 +13,14 @@ test_description='merge-recursive options
 
 . ./test-lib.sh
 
+if test_have_prereq MINGW; then
+	export GREP_OPTIONS=-U
+	SED_OPTIONS=-b
+fi
+
 test_expect_success 'setup' '
 	conflict_hunks () {
-		sed -n -e "
+		sed $SED_OPTIONS -n -e "
 			/^<<<</ b inconflict
 			b
 			: inconflict
@@ -69,7 +74,7 @@ test_expect_success 'setup' '
 	git commit -m "Initial revision" &&
 
 	git checkout -b remote &&
-	sed -e "
+	sed $SED_OPTIONS -e "
 			s/\.  /\. /g
 			s/[?]  /? /g
 			s/    /	/g
@@ -81,7 +86,7 @@ test_expect_success 'setup' '
 	git commit -a -m "Remove cruft" &&
 
 	git checkout master &&
-	sed -e "
+	sed $SED_OPTIONS -e "
 			s/\(not in his right mind\),\(.*\)/\1;\2Q/
 			s/Quite correct\(.*\)/It is too correct\1Q/
 			s/unintentionally/un intentionally/