proc-receive hook tests: use "test_hook" instead of "write_script"

Change the t5411/*.sh tests to use the test_hook helper instead of "write_script". Unfortunately these tests do the setup and test across different test_expect_success blocks, so we have to use --clobber (implying --setup) for these. Let's change those that can use a quoted here-doc to do so while we're at it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Mar 17, 2022 at 11:13 UTC c39176b1601a2005222c797912281a5a2dad8dcc
26 files changed +67 -67
t/t5411/once-0010-report-status-v1.sh
+1 -1
@@ -3,7 +3,7 @@ test_expect_success "setup receive.procReceiveRefs" '
3 '
4
5 test_expect_success "setup proc-receive hook" '
6 - write_script "$upstream/hooks/proc-receive" <<-EOF
6 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
7 printf >&2 "# proc-receive hook\n"
8 test-tool proc-receive -v \
9 -r "ok refs/for/main/topic1" \
t/t5411/test-0002-pre-receive-declined.sh
+2 -2
@@ -1,6 +1,6 @@
1 test_expect_success "setup pre-receive hook ($PROTOCOL)" '
2 mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
3 - write_script "$upstream/hooks/pre-receive" <<-EOF
3 + test_hook -C "$upstream" --clobber pre-receive <<-\EOF
4 exit 1
5 EOF
6 '
@@ -21,7 +21,7 @@ test_expect_success "git-push is declined ($PROTOCOL)" '
21 EOF
22 test_cmp expect actual &&
23
24 - test_cmp_refs -C "$upstream" <<-EOF
24 + test_cmp_refs -C "$upstream" <<-\EOF
25 <COMMIT-A> refs/heads/main
26 EOF
27 '
t/t5411/test-0003-pre-receive-declined--porcelain.sh
+1 -1
@@ -1,6 +1,6 @@
1 test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" '
2 mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
3 - write_script "$upstream/hooks/pre-receive" <<-EOF
3 + test_hook -C "$upstream" --clobber pre-receive <<-\EOF
4 exit 1
5 EOF
6 '
t/t5411/test-0013-bad-protocol.sh
+10 -10
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v --version 2
5 EOF
@@ -40,7 +40,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
40 '
41
42 test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
43 - write_script "$upstream/hooks/proc-receive" <<-EOF
43 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
44 printf >&2 "# proc-receive hook\n"
45 test-tool proc-receive -v --die-read-version
46 EOF
@@ -65,13 +65,13 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO
65 grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
66 grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
67
68 - test_cmp_refs -C "$upstream" <<-EOF
68 + test_cmp_refs -C "$upstream" <<-\EOF
69 <COMMIT-A> refs/heads/main
70 EOF
71 '
72
73 test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
74 - write_script "$upstream/hooks/proc-receive" <<-EOF
74 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
75 printf >&2 "# proc-receive hook\n"
76 test-tool proc-receive -v --die-write-version
77 EOF
@@ -102,7 +102,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT
102 '
103
104 test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
105 - write_script "$upstream/hooks/proc-receive" <<-EOF
105 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
106 printf >&2 "# proc-receive hook\n"
107 test-tool proc-receive -v --die-read-commands
108 EOF
@@ -132,7 +132,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT
132 '
133
134 test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
135 - write_script "$upstream/hooks/proc-receive" <<-EOF
135 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
136 printf >&2 "# proc-receive hook\n"
137 test-tool proc-receive -v --die-read-push-options
138 EOF
@@ -164,7 +164,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
164 '
165
166 test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
167 - write_script "$upstream/hooks/proc-receive" <<-EOF
167 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
168 printf >&2 "# proc-receive hook\n"
169 test-tool proc-receive -v --die-write-report
170 EOF
@@ -194,7 +194,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO
194 '
195
196 test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
197 - write_script "$upstream/hooks/proc-receive" <<-EOF
197 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
198 printf >&2 "# proc-receive hook\n"
199 test-tool proc-receive -v
200 EOF
@@ -236,7 +236,7 @@ test_expect_success "cleanup ($PROTOCOL)" '
236 '
237
238 test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
239 - write_script "$upstream/hooks/proc-receive" <<-EOF
239 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
240 printf >&2 "# proc-receive hook\n"
241 test-tool proc-receive -v \
242 -r "ok"
@@ -269,7 +269,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
269 '
270
271 test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
272 - write_script "$upstream/hooks/proc-receive" <<-EOF
272 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
273 printf >&2 "# proc-receive hook\n"
274 test-tool proc-receive -v \
275 -r "xx refs/for/main/topic"
t/t5411/test-0014-bad-protocol--porcelain.sh
+9 -9
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v --version 2
5 EOF
@@ -40,7 +40,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc
40 '
41
42 test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
43 - write_script "$upstream/hooks/proc-receive" <<-EOF
43 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
44 printf >&2 "# proc-receive hook\n"
45 test-tool proc-receive -v --die-read-version
46 EOF
@@ -71,7 +71,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO
71 '
72
73 test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
74 - write_script "$upstream/hooks/proc-receive" <<-EOF
74 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
75 printf >&2 "# proc-receive hook\n"
76 test-tool proc-receive -v --die-write-version
77 EOF
@@ -102,7 +102,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT
102 '
103
104 test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
105 - write_script "$upstream/hooks/proc-receive" <<-EOF
105 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
106 printf >&2 "# proc-receive hook\n"
107 test-tool proc-receive -v --die-read-commands
108 EOF
@@ -132,7 +132,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT
132 '
133
134 test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
135 - write_script "$upstream/hooks/proc-receive" <<-EOF
135 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
136 printf >&2 "# proc-receive hook\n"
137 test-tool proc-receive -v --die-read-push-options
138 EOF
@@ -164,7 +164,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
164 '
165
166 test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
167 - write_script "$upstream/hooks/proc-receive" <<-EOF
167 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
168 printf >&2 "# proc-receive hook\n"
169 test-tool proc-receive -v --die-write-report
170 EOF
@@ -194,7 +194,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO
194 '
195
196 test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
197 - write_script "$upstream/hooks/proc-receive" <<-EOF
197 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
198 printf >&2 "# proc-receive hook\n"
199 test-tool proc-receive -v
200 EOF
@@ -236,7 +236,7 @@ test_expect_success "cleanup ($PROTOCOL/porcelain)" '
236 '
237
238 test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
239 - write_script "$upstream/hooks/proc-receive" <<-EOF
239 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
240 printf >&2 "# proc-receive hook\n"
241 test-tool proc-receive -v \
242 -r "ok"
@@ -270,7 +270,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
270 '
271
272 test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" '
273 - write_script "$upstream/hooks/proc-receive" <<-EOF
273 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
274 printf >&2 "# proc-receive hook\n"
275 test-tool proc-receive -v \
276 -r "xx refs/for/main/topic"
t/t5411/test-0020-report-ng.sh
+2 -2
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ng refs/for/main/topic"
@@ -31,7 +31,7 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
31 '
32
33 test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
34 - write_script "$upstream/hooks/proc-receive" <<-EOF
34 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
35 printf >&2 "# proc-receive hook\n"
36 test-tool proc-receive -v \
37 -r "ng refs/for/main/topic error msg"
t/t5411/test-0021-report-ng--porcelain.sh
+2 -2
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ng refs/for/main/topic"
@@ -32,7 +32,7 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/por
32 '
33
34 test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" '
35 - write_script "$upstream/hooks/proc-receive" <<-EOF
35 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
36 printf >&2 "# proc-receive hook\n"
37 test-tool proc-receive -v \
38 -r "ng refs/for/main/topic error msg"
t/t5411/test-0022-report-unexpect-ref.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/heads/main"
t/t5411/test-0023-report-unexpect-ref--porcelain.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/heads/main"
t/t5411/test-0024-report-unknown-ref.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic"
t/t5411/test-0025-report-unknown-ref--porcelain.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic"
t/t5411/test-0026-push-options.sh
+3 -3
@@ -1,6 +1,6 @@
1 test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL)" '
2 git -C "$upstream" config receive.advertisePushOptions false &&
3 - write_script "$upstream/hooks/proc-receive" <<-EOF
3 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
4 printf >&2 "# proc-receive hook\n"
5 test-tool proc-receive -v \
6 -r "ok refs/for/main/topic"
@@ -31,7 +31,7 @@ test_expect_success "enable push options ($PROTOCOL)" '
31 '
32
33 test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" '
34 - write_script "$upstream/hooks/proc-receive" <<-EOF
34 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
35 printf >&2 "# proc-receive hook\n"
36 test-tool proc-receive -v \
37 --version 0 \
@@ -75,7 +75,7 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL)
75 '
76
77 test_expect_success "restore proc-receive hook ($PROTOCOL)" '
78 - write_script "$upstream/hooks/proc-receive" <<-EOF
78 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
79 printf >&2 "# proc-receive hook\n"
80 test-tool proc-receive -v \
81 -r "ok refs/for/main/topic"
t/t5411/test-0027-push-options--porcelain.sh
+3 -3
@@ -1,6 +1,6 @@
1 test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" '
2 git -C "$upstream" config receive.advertisePushOptions false &&
3 - write_script "$upstream/hooks/proc-receive" <<-EOF
3 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
4 printf >&2 "# proc-receive hook\n"
5 test-tool proc-receive -v \
6 -r "ok refs/for/main/topic"
@@ -32,7 +32,7 @@ test_expect_success "enable push options ($PROTOCOL/porcelain)" '
32 '
33
34 test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL/porcelain)" '
35 - write_script "$upstream/hooks/proc-receive" <<-EOF
35 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
36 printf >&2 "# proc-receive hook\n"
37 test-tool proc-receive -v \
38 --version 0 \
@@ -78,7 +78,7 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL/
78 '
79
80 test_expect_success "restore proc-receive hook ($PROTOCOL/porcelain)" '
81 - write_script "$upstream/hooks/proc-receive" <<-EOF
81 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
82 printf >&2 "# proc-receive hook\n"
83 test-tool proc-receive -v \
84 -r "ok refs/for/main/topic"
t/t5411/test-0030-report-ok.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic"
t/t5411/test-0031-report-ok--porcelain.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic"
t/t5411/test-0032-report-with-options.sh
+7 -7
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "option refname refs/pull/123/head" \
@@ -30,7 +30,7 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)
30 '
31
32 test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" '
33 - write_script "$upstream/hooks/proc-receive" <<-EOF
33 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
34 printf >&2 "# proc-receive hook\n"
35 test-tool proc-receive -v \
36 -r "ok refs/for/main/topic" \
@@ -62,7 +62,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL)" '
62 '
63
64 test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL)" '
65 - write_script "$upstream/hooks/proc-receive" <<-EOF
65 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
66 printf >&2 "# proc-receive hook\n"
67 test-tool proc-receive -v \
68 -r "ok refs/for/main/topic" \
@@ -95,7 +95,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
95 '
96
97 test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL)" '
98 - write_script "$upstream/hooks/proc-receive" <<-EOF
98 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
99 printf >&2 "# proc-receive hook\n"
100 test-tool proc-receive -v \
101 -r "ok refs/for/main/topic" \
@@ -129,7 +129,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)
129 '
130
131 test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" '
132 - write_script "$upstream/hooks/proc-receive" <<-EOF
132 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
133 printf >&2 "# proc-receive hook\n"
134 test-tool proc-receive -v \
135 -r "ok refs/for/main/topic" \
@@ -161,7 +161,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" '
161 '
162
163 test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL)" '
164 - write_script "$upstream/hooks/proc-receive" <<-EOF
164 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
165 printf >&2 "# proc-receive hook\n"
166 test-tool proc-receive -v \
167 -r "ok refs/for/main/topic" \
@@ -195,7 +195,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)
195 '
196
197 test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" '
198 - write_script "$upstream/hooks/proc-receive" <<-EOF
198 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
199 printf >&2 "# proc-receive hook\n"
200 test-tool proc-receive -v \
201 -r "ok refs/for/a/b/c/topic" \
t/t5411/test-0033-report-with-options--porcelain.sh
+7 -7
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "option refname refs/pull/123/head" \
@@ -31,7 +31,7 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/
31 '
32
33 test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
34 - write_script "$upstream/hooks/proc-receive" <<-EOF
34 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
35 printf >&2 "# proc-receive hook\n"
36 test-tool proc-receive -v \
37 -r "ok refs/for/main/topic" \
@@ -64,7 +64,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)"
64 '
65
66 test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
67 - write_script "$upstream/hooks/proc-receive" <<-EOF
67 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
68 printf >&2 "# proc-receive hook\n"
69 test-tool proc-receive -v \
70 -r "ok refs/for/main/topic" \
@@ -99,7 +99,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
99 '
100
101 test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
102 - write_script "$upstream/hooks/proc-receive" <<-EOF
102 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
103 printf >&2 "# proc-receive hook\n"
104 test-tool proc-receive -v \
105 -r "ok refs/for/main/topic" \
@@ -134,7 +134,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/
134 '
135
136 test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
137 - write_script "$upstream/hooks/proc-receive" <<-EOF
137 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
138 printf >&2 "# proc-receive hook\n"
139 test-tool proc-receive -v \
140 -r "ok refs/for/main/topic" \
@@ -167,7 +167,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)"
167 '
168
169 test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
170 - write_script "$upstream/hooks/proc-receive" <<-EOF
170 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
171 printf >&2 "# proc-receive hook\n"
172 test-tool proc-receive -v \
173 -r "ok refs/for/main/topic" \
@@ -202,7 +202,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/
202 '
203
204 test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
205 - write_script "$upstream/hooks/proc-receive" <<-EOF
205 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
206 printf >&2 "# proc-receive hook\n"
207 test-tool proc-receive -v \
208 -r "ok refs/for/a/b/c/topic" \
t/t5411/test-0034-report-ft.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic" \
t/t5411/test-0035-report-ft--porcelain.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-\EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic" \
t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
+3 -3
@@ -14,7 +14,7 @@ test_expect_success "setup git config for remote-tracking of special refs" '
14 '
15
16 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" '
17 - write_script "$upstream/hooks/proc-receive" <<-EOF
17 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
18 printf >&2 "# proc-receive hook\n"
19 test-tool proc-receive -v \
20 -r "ok refs/for/main/topic" \
@@ -87,7 +87,7 @@ test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" '
87 '
88
89 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" '
90 - write_script "$upstream/hooks/proc-receive" <<-EOF
90 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
91 printf >&2 "# proc-receive hook\n"
92 test-tool proc-receive -v \
93 -r "ok refs/for/main/topic" \
@@ -162,7 +162,7 @@ test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" '
162 '
163
164 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" '
165 - write_script "$upstream/hooks/proc-receive" <<-EOF
165 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
166 printf >&2 "# proc-receive hook\n"
167 test-tool proc-receive -v \
168 -r "ok refs/for/main/topic" \
t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
+3 -3
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/main/topic" \
@@ -58,7 +58,7 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for
58 '
59
60 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" '
61 - write_script "$upstream/hooks/proc-receive" <<-EOF
61 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
62 printf >&2 "# proc-receive hook\n"
63 test-tool proc-receive -v \
64 -r "ok refs/for/main/topic" \
@@ -119,7 +119,7 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for
119 '
120
121 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" '
122 - write_script "$upstream/hooks/proc-receive" <<-EOF
122 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
123 printf >&2 "# proc-receive hook\n"
124 test-tool proc-receive -v \
125 -r "ok refs/for/main/topic" \
t/t5411/test-0038-report-mixed-refs.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/next/topic2" \
t/t5411/test-0039-report-mixed-refs--porcelain.sh
+1 -1
@@ -1,5 +1,5 @@
1 test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
2 - write_script "$upstream/hooks/proc-receive" <<-EOF
2 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
3 printf >&2 "# proc-receive hook\n"
4 test-tool proc-receive -v \
5 -r "ok refs/for/next/topic2" \
t/t5411/test-0040-process-all-refs.sh
+1 -1
@@ -17,7 +17,7 @@ test_expect_success "setup upstream branches ($PROTOCOL)" '
17 '
18
19 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
20 - write_script "$upstream/hooks/proc-receive" <<-EOF
20 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
21 printf >&2 "# proc-receive hook\n"
22 test-tool proc-receive -v \
23 -r "ok refs/heads/main" \
t/t5411/test-0041-process-all-refs--porcelain.sh
+1 -1
@@ -17,7 +17,7 @@ test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" '
17 '
18
19 test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
20 - write_script "$upstream/hooks/proc-receive" <<-EOF
20 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
21 printf >&2 "# proc-receive hook\n"
22 test-tool proc-receive -v \
23 -r "ok refs/heads/main" \
t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
+2 -2
@@ -9,7 +9,7 @@ test_expect_success "config receive.procReceiveRefs with modifiers ($PROTOCOL)"
9 '
10
11 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
12 - write_script "$upstream/hooks/proc-receive" <<-EOF
12 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
13 printf >&2 "# proc-receive hook\n"
14 test-tool proc-receive -v \
15 -r "ok refs/heads/main" \
@@ -70,7 +70,7 @@ test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" '
70 '
71
72 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
73 - write_script "$upstream/hooks/proc-receive" <<-EOF
73 + test_hook -C "$upstream" --clobber proc-receive <<-EOF
74 printf >&2 "# proc-receive hook\n"
75 test-tool proc-receive -v \
76 -r "ok refs/heads/main" \