[PATCH] Side-step line-ending corruption leading to t3032 failures.

[Eric Sunshine]

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 <suns...@sunshineco.com>
---
t/t3032-merge-recursive-options.sh | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 2293797..03ea961 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/
--
1.7.2.3.msysgit.0.307.g351db

[Pat Thoyts]

thank you - applied to devel.