summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-19 21:35:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-09-19 21:35:25 (GMT)
commit279ebd47614f182152fec046c0697037a4efbecd (patch)
treeed5b1f9964c58ca3f63d9a87c262903b5c3e76e3
parent42bf77c7d013ac595b3463eb064b66d7b969f55c (diff)
parent255a6f91ae4600ee2d257670477caf97b7986470 (diff)
downloadgit-279ebd47614f182152fec046c0697037a4efbecd.zip
git-279ebd47614f182152fec046c0697037a4efbecd.tar.gz
git-279ebd47614f182152fec046c0697037a4efbecd.tar.bz2
Merge branch 'ad/t1800-cygwin'
Test fix. * ad/t1800-cygwin: t1800: correct test to handle Cygwin
-rwxr-xr-xt/t1800-hook.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
index 64096ad..43fcb7c 100755
--- a/t/t1800-hook.sh
+++ b/t/t1800-hook.sh
@@ -157,9 +157,9 @@ test_expect_success 'git hook run a hook with a bad shebang' '
write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
# TODO: We should emit the same (or at least a more similar)
- # error on Windows and !Windows. See the OS-specific code in
- # start_command()
- if test_have_prereq !WINDOWS
+ # error on MINGW (essentially Git for Windows) and all other
+ # platforms.. See the OS-specific code in start_command()
+ if test_have_prereq !MINGW
then
cat >expect <<-\EOF
fatal: cannot run bad-hooks/test-hook: ...