{"thread":{"id":"26061","subject":"[PATCH 10/14] t6038-*.sh: Pass the -b (--binary) option to sed on cygwin","startedAt":"2010-12-14T18:32:12Z","lastAt":"2010-12-14T18:32:12Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":14},"messages":[{"id":"158073","messageId":"4D07B82C.2060701@ramsay1.demon.co.uk","threadId":"26061","inReplyTo":null,"subject":"[PATCH 10/14] t6038-*.sh: Pass the -b (--binary) option to sed on cygwin","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2010-12-14T18:32:12Z","receivedAt":"2010-12-14T18:32:12Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nThe tests using the fuzz_conflict helper function (tests 5-6)\nfail on cygwin in the same way they used to on MinGW, prior\nto commit ca02ad3. The solution is also the same; passing the\n-b (--binary) option to sed, using the SED_OPTIONS variable.\nWe introduce a new prerequisite SED_STRIPS_CR to use in the\nconditional initialisation of SED_OPTIONS, rather than MINGW.\nThe new prerequisite is set in test-lib.sh for both MinGW and\nCygwin.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n t/t6038-merge-text-auto.sh |    2 +-\n t/test-lib.sh              |    8 ++++++++\n 2 files changed, 9 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh\nindex 460bf74..d9c2d38 100755\n--- a/t/t6038-merge-text-auto.sh\n+++ b/t/t6038-merge-text-auto.sh\n@@ -14,7 +14,7 @@ test_description='CRLF merge conflict across text=auto change\n \n . ./test-lib.sh\n \n-test_have_prereq MINGW && SED_OPTIONS=-b\n+test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b\n \n test_expect_success setup '\n \tgit config core.autocrlf false &&\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 48fa516..9e74357 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -1057,6 +1057,14 @@ case $(uname -s) in\n \t# backslashes in pathspec are converted to '/'\n \t# exec does not inherit the PID\n \ttest_set_prereq MINGW\n+\ttest_set_prereq SED_STRIPS_CR\n+\t;;\n+*CYGWIN*)\n+\ttest_set_prereq POSIXPERM\n+\ttest_set_prereq BSLASHPSPEC\n+\ttest_set_prereq EXECKEEPSPID\n+\ttest_set_prereq NOT_MINGW\n+\ttest_set_prereq SED_STRIPS_CR\n \t;;\n *)\n \ttest_set_prereq POSIXPERM\n-- \n1.7.3\n"}]}