| commit | a2253b9068ea0890436131a23310916d17fcb702 | |
| author | Eric Sunshine <sunshine@sunshineco.com> | |
| Fri, 17 Sep 2010 13:16:01 +0000 (17 09:16 -0400) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Sun, 24 Oct 2010 23:04:09 +0000 (25 00:04 +0100) | ||
| tree | 31e262788e216711581e99c66aeb42042747bd7e | treesnapshot (tar.gz zip) |
| parent | 0878369456847115edf478bf45bc13196b3b0dcb | commitdiff |
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.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
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.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| t/t6038-merge-text-auto.sh | diffblobblamehistory |