aboutsummaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-12-14 18:32:12 +0000
committerJunio C Hamano <gitster@pobox.com>2011-01-08 23:36:37 -0800
commita31d066524e55351b385e34f9494f36e9f960a6c (patch)
tree737d52373064437e0d147e673b0e1257198febc6 /INSTALL
parent0137ef7dae553f9eb89cbae1ddb60b72046ba28b (diff)
downloadgit-a31d066524e55351b385e34f9494f36e9f960a6c.tar.gz
git-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 'INSTALL')
0 files changed, 0 insertions, 0 deletions