Side-step line-ending corruption leading to t3032 failures.
commit51da7a909f546cc0ae00a6259c8a3cd019e8e42a
authorEric Sunshine <sunshine@sunshineco.com>
Mon, 27 Sep 2010 12:01:35 +0000 (27 08:01 -0400)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 19 Dec 2010 23:48:28 +0000 (20 00:48 +0100)
treee28295e539a66555565f2beae91ae3d627a0a053
parent2f689ae60b0e626edfb1cbd6a08ba1785c89566e
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