mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
97f2c33a52
commit
ca02ad3447
|
@ -14,6 +14,8 @@ test_description='CRLF merge conflict across text=auto change
|
|||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_have_prereq MINGW && SED_OPTIONS=-b
|
||||
|
||||
test_expect_success setup '
|
||||
git config core.autocrlf false &&
|
||||
|
||||
|
@ -60,7 +62,7 @@ test_expect_success setup '
|
|||
|
||||
test_expect_success 'set up fuzz_conflict() helper' '
|
||||
fuzz_conflict() {
|
||||
sed -e "s/^\([<>=]......\) .*/\1/" "$@"
|
||||
sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
|
||||
}
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue