Code

Side-step sed line-ending "corruption" leading to t6038 failure.
authorEric Sunshine <sunshine@sunshineco.com>
Fri, 17 Sep 2010 13:16:01 +0000 (09:16 -0400)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Sun, 3 Oct 2010 22:29:19 +0000 (23:29 +0100)
commitca02ad3447efdbd4cb2aa9ba0ee3fc6124035274
treef73eea5252eed6ad83b9e59d7ac53ceaa8758818
parent97f2c33a52d2c33d6f6c8569e875fde0ef18e2e2
Side-step sed line-ending "corruption" leading to t6038 failure.

By default, MSYS sed throws away CR from CRLF line-endings.  Tests
t6038.5 and t6038.6 employ sed to normalize conflict output of git-merge
for validation purposes.  These tests expect CRLF line-endings to be
present in the normalized output of git-merge, and thus fail when sed
undesirably removes CR.  Fix by employing sed's -b/--binary switch to
suppress its default behavior of dropping CR characters.

Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
t/t6038-merge-text-auto.sh