On 2020-05-07 17:53:57-0700, Emily Shaffer <emilyshaffer@xxxxxxxxxx> wrote:
> +test_expect_success 'indicates populated hooks' '
> + test_when_finished rm git-bugreport-hooks.txt &&
> + test_when_finished rm -fr .git/hooks &&
> + rm -fr .git/hooks &&
> + mkdir .git/hooks &&
> + for hook in applypatch-msg prepare-commit-msg.sample
> + do
> + write_script ".git/hooks/$hook" <<-\EOF || return 1
> + echo "hook $hook exists"
> + EOF
> + done &&
> + git bugreport -s hooks &&
> + grep applypatch-msg git-bugreport-hooks.txt &&
> + ! grep prepare-commit-msg git-bugreport-hooks.txt
Hi Emily,
I think this is a bit more correct test.
---------8<----------
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@xxxxxxxxx>
Date: Fri, 8 May 2020 08:26:53 +0700
Subject: [PATCH] fixup! bugreport: collect list of populated hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use an exact match to check for populated hooks
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx>
---
t/t0091-bugreport.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
index 9450cc02e3..789e8f1ac7 100755
--- a/t/t0091-bugreport.sh
+++ b/t/t0091-bugreport.sh
@@ -67,8 +67,13 @@ test_expect_success 'indicates populated hooks' '
EOF
done &&
git bugreport -s hooks &&
- grep applypatch-msg git-bugreport-hooks.txt &&
- ! grep prepare-commit-msg git-bugreport-hooks.txt
+ cat <<-\EOF >expected &&
+ applypatch-msg
+
+ EOF
+ awk -F "]\\n" -v RS="[" "/applypatch-msg/{print \$2}" \
+ git-bugreport-hooks.txt >actual &&
+ test_cmp expected actual
'
test_done
--
2.26.2.672.g232c24e857
--
Danh
