Side-step line-ending corruption leading to t3032 failures.
commit81a0f841e67fe01c8b93d1942435425f96073c0e
authorEric Sunshine <sunshine@sunshineco.com>
Mon, 27 Sep 2010 12:01:35 +0000 (27 08:01 -0400)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 8 Jan 2011 14:17:29 +0000 (8 15:17 +0100)
tree1065b4c15c1607e8a207c89b8ec7803f1c1e2b6f
parente232abe04718c8137016ce025f4ac315c244cf87
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