| commit | a31d066524e55351b385e34f9494f36e9f960a6c | |
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | |
| Tue, 14 Dec 2010 18:32:12 +0000 (14 18:32 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Jan 2011 07:36:37 +0000 (8 23:36 -0800) | ||
| tree | 737d52373064437e0d147e673b0e1257198febc6 | treesnapshot (tar.gz zip) |
| parent | 0137ef7dae553f9eb89cbae1ddb60b72046ba28b | commitdiff |
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>
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>
| t/t6038-merge-text-auto.sh | diffblobblamehistory | |
| t/test-lib.sh | diffblobblamehistory |