| commit | 84538751a19e001b281a06829226b3d16af40844 | |
| 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> | |
| Mon, 20 Sep 2010 14:53:43 +0000 (20 15:53 +0100) | ||
| tree | 4b0040358863a9ae0a2b648c8aa42e50eb00f4f7 | treesnapshot (tar.gz zip) |
| parent | 90a513606997be42ef5b0451a20598a8f4b68298 | 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 |