diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-18 21:59:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-18 21:59:11 -0700 |
commit | 578183bcb0fd30b7a36b98b714de96220793e712 (patch) | |
tree | fe34ca7c397d1ad49000624b7e5c59ccfa46a6ad /t/t9001-send-email.sh | |
parent | 54633cd53bf22672aed900a2a9df5d4f92548091 (diff) | |
parent | f64943d242d3b0fff40684d09033f17bb9747a38 (diff) | |
download | git-578183bcb0fd30b7a36b98b714de96220793e712.tar.gz |
Merge branch 'pt/mingw-misc-fixes'
* pt/mingw-misc-fixes:
t9901: fix line-ending dependency on windows
mingw: ensure sockets are initialized before calling gethostname
mergetools: use the correct tool for Beyond Compare 3 on Windows
t9300: do not run --cat-blob-fd related tests on MinGW
git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
t9001: do not fail only due to CR/LF issues
t1020: disable the pwd test on MinGW
Diffstat (limited to 't/t9001-send-email.sh')
-rwxr-xr-x | t/t9001-send-email.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 87b4acc9a6..8c12c65c72 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -23,6 +23,7 @@ test_expect_success $PREREQ \ echo do echo " echo \"!\$a!\"" echo "done >commandline\$output" + test_have_prereq MINGW && echo "dos2unix commandline\$output" echo "cat > msgtxt\$output" ) >fake.sendmail && chmod +x ./fake.sendmail && |