diff options
| author |  Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-12-14 18:32:12 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-01-08 23:36:37 -0800 |
| commit | a31d066524e55351b385e34f9494f36e9f960a6c (patch) | |
| tree | 737d52373064437e0d147e673b0e1257198febc6 /t/t6038-merge-text-auto.sh | |
| parent | t800?-blame.sh: retitle uniquely (diff) | |
| download | tgif-a31d066524e55351b385e34f9494f36e9f960a6c.tar.xz | |
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
The tests using the fuzz_conflict helper function (tests 5-6)
fail on cygwin in the same way they used to on MinGW, prior
to commit ca02ad3. The solution is also the same; passing the
-b (--binary) option to sed, using the SED_OPTIONS variable.
We introduce a new prerequisite SED_STRIPS_CR to use in the
conditional initialisation of SED_OPTIONS, rather than MINGW.
The new prerequisite is set in test-lib.sh for both MinGW and
Cygwin.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6038-merge-text-auto.sh')
| -rwxr-xr-x | t/t6038-merge-text-auto.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh index 460bf741b5..d9c2d386dd 100755 --- a/t/t6038-merge-text-auto.sh +++ b/t/t6038-merge-text-auto.sh @@ -14,7 +14,7 @@ test_description='CRLF merge conflict across text=auto change . ./test-lib.sh -test_have_prereq MINGW && SED_OPTIONS=-b +test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b test_expect_success setup ' git config core.autocrlf false && |