diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2010-09-17 09:16:01 -0400 |
|---|---|---|
| committer |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-10-03 23:29:19 +0100 |
| commit | ca02ad3447efdbd4cb2aa9ba0ee3fc6124035274 (patch) | |
| tree | f73eea5252eed6ad83b9e59d7ac53ceaa8758818 /t/t6026-merge-attr.sh | |
| parent | Skip 'git archive --remote' test on msysGit (diff) | |
| download | tgif-ca02ad3447efdbd4cb2aa9ba0ee3fc6124035274.tar.xz | |
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>
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions