Here is a suggested rewrite of t7519 (I used t7520 to avoid crashing
with another topic in flight).

 - use unused/unallocated 7520 to avoid crashes with bp/fsmonitor
   topic

 - use setup inside test_expect_success

 - use test_i18ngrep to avoid gettext-poison build gotchas

 - look for specific advise message to make the test more robust

 - do not run Git on LHS of a pipe when we do not have to

 - use test_config and test_unconfig


 t/t7520-ignored-hook-warning.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100755 t/t7520-ignored-hook-warning.sh

diff --git a/t/t7520-ignored-hook-warning.sh b/t/t7520-ignored-hook-warning.sh
new file mode 100755
index 0000000000..634fb7f23a
--- /dev/null
+++ b/t/t7520-ignored-hook-warning.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+test_description='ignored hook warning'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+       hookdir="$(git rev-parse --git-dir)/hooks" &&
+       hook="$hookdir/pre-commit" &&
+       mkdir -p "$hookdir" &&
+       write_script "$hook" <<-\EOF
+       exit 0
+       EOF
+'
+
+test_expect_success 'no warning if hook is not ignored' '
+       git commit --allow-empty -m "more" 2>message &&
+       test_i18ngrep ! -e "hook was ignored" message
+'
+
+test_expect_success POSIXPERM 'warning if hook is ignored' '
+       chmod -x "$hook" &&
+       git commit --allow-empty -m "even more" 2>message &&
+       test_i18ngrep -e "hook was ignored" message
+'
+
+test_expect_success POSIXPERM 'no warning if advice.ignoredHook set to false' '
+       test_config advice.ignoredHook false &&
+       chmod -x "$hook" &&
+       git commit --allow-empty -m "even more" 2>message &&
+       test_i18ngrep ! -e "hook was ignored" message
+'
+
+test_expect_success 'no warning if unset advice.ignoredHook and hook removed' '
+       rm -f "$hook" &&
+       test_unconfig advice.ignoredHook &&
+       git commit --allow-empty -m "even more" 2>message &&
+       test_i18ngrep ! -e "hook was ignored" message
+'
+
+test_done
-- 
2.15.0-rc0-155-g07e9c1a78d

Reply via email to