| commit | f3b86ef5dd2899867fed9192ecfe5d170b67e5ce | |
| author | Eric Sunshine <sunshine@sunshineco.com> | |
| Mon, 27 Sep 2010 12:01:35 +0000 (27 08:01 -0400) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 28 Dec 2010 17:56:11 +0000 (28 18:56 +0100) | ||
| tree | 7c8639ee53cbe65e29124ef6e178f9466b13638a | treesnapshot (tar.gz zip) |
| parent | 8e7ccdb919ef1133ab4da9a10d82e75ea82b1a4e | commitdiff |
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>
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 | diffblobblamehistory |