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>

diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
index 297b10925d59a85ab21c26d5a5173ab015d3c628..f9ffb01e50997a45f75b053507b49738b041427d 100644 (file)
--- a/t/t5411/once-0010-report-status-v1.sh
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -3,7 +3,7 @@ test_expect_success "setup receive.procReceiveRefs" '
 '
 
 test_expect_success "setup proc-receive hook" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic1" \

diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh
index 0c3490c9b1b4483f68a9d1ea26455a77a934e69c..98a9d13041a05d7eee850feccba01c20a39497e2 100644 (file)
--- a/t/t5411/test-0002-pre-receive-declined.sh
+++ b/t/t5411/test-0002-pre-receive-declined.sh
@@ -1,6 +1,6 @@
 test_expect_success "setup pre-receive hook ($PROTOCOL)" '
        mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
-       write_script "$upstream/hooks/pre-receive" <<-EOF
+       test_hook -C "$upstream" --clobber pre-receive <<-\EOF
        exit 1
        EOF
 '
@@ -21,7 +21,7 @@ test_expect_success "git-push is declined ($PROTOCOL)" '
        EOF
        test_cmp expect actual &&
 
-       test_cmp_refs -C "$upstream" <<-EOF
+       test_cmp_refs -C "$upstream" <<-\EOF
        <COMMIT-A> refs/heads/main
        EOF
 '

diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
index 2393b04ad95dd804b44a12dddebcf305d92be10d..67ca6dc4f8f232038bc93f4920e7b1bf652fd1b5 100644 (file)
--- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh
+++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
@@ -1,6 +1,6 @@
 test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" '
        mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
-       write_script "$upstream/hooks/pre-receive" <<-EOF
+       test_hook -C "$upstream" --clobber pre-receive <<-\EOF
        exit 1
        EOF
 '

diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh
index c08a00ded29eb4df69c0d72fed4569a3247d1a9c..8d22e17aee31a54b3dd1076c7ddb29e52a517d30 100644 (file)
--- a/t/t5411/test-0013-bad-protocol.sh
+++ b/t/t5411/test-0013-bad-protocol.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --version 2
        EOF
@@ -40,7 +40,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-version
        EOF
@@ -65,13 +65,13 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO
        grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
        grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
 
-       test_cmp_refs -C "$upstream" <<-EOF
+       test_cmp_refs -C "$upstream" <<-\EOF
        <COMMIT-A> refs/heads/main
        EOF
 '
 
 test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-write-version
        EOF
@@ -102,7 +102,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-commands
        EOF
@@ -132,7 +132,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-push-options
        EOF
@@ -164,7 +164,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
 '
 
 test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-write-report
        EOF
@@ -194,7 +194,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO
 '
 
 test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v
        EOF
@@ -236,7 +236,7 @@ test_expect_success "cleanup ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok"
@@ -269,7 +269,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "xx refs/for/main/topic"

diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh
index 3eaa597e0f78bec2630ced80bee2b94ddd2e98b7..298a3d1feca1ff76d145eb7d6a452e8e50f1325d 100644 (file)
--- a/t/t5411/test-0014-bad-protocol--porcelain.sh
+++ b/t/t5411/test-0014-bad-protocol--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --version 2
        EOF
@@ -40,7 +40,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-version
        EOF
@@ -71,7 +71,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO
 '
 
 test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-write-version
        EOF
@@ -102,7 +102,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-commands
        EOF
@@ -132,7 +132,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT
 '
 
 test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-read-push-options
        EOF
@@ -164,7 +164,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
 '
 
 test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v --die-write-report
        EOF
@@ -194,7 +194,7 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO
 '
 
 test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v
        EOF
@@ -236,7 +236,7 @@ test_expect_success "cleanup ($PROTOCOL/porcelain)" '
 '
 
 test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok"
@@ -270,7 +270,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
 '
 
 test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "xx refs/for/main/topic"

diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh
index e915dbc28df93fdaee703b33c8ea7666d0917b8c..6347c9629b304aaf60610649bdae030b7fdd6a9f 100644 (file)
--- a/t/t5411/test-0020-report-ng.sh
+++ b/t/t5411/test-0020-report-ng.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ng refs/for/main/topic"
@@ -31,7 +31,7 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ng refs/for/main/topic error msg"

diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh
index 2a392e099b9ffdb6705749876b69039a83670e68..502b34fe3dd723f8c469cc113e2cca29d1b59f2f 100644 (file)
--- a/t/t5411/test-0021-report-ng--porcelain.sh
+++ b/t/t5411/test-0021-report-ng--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ng refs/for/main/topic"
@@ -32,7 +32,7 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/por
 '
 
 test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ng refs/for/main/topic error msg"

diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh
index f7a494bdb9d16fb3f25a3ea0884f107afa4a6555..7744392a6262cfa3935e37e6941029c4646a85c9 100644 (file)
--- a/t/t5411/test-0022-report-unexpect-ref.sh
+++ b/t/t5411/test-0022-report-unexpect-ref.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main"

diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
index 63c479e975964b876cc48f8293a156321ec21b80..6d116ef692c6c281fb1168f75607bfeaa5f3188e 100644 (file)
--- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
+++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main"

diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh
index af055aa0864d2adbdb5f1020953e17c63e07c642..619ca2f421aad5fbec8597f6741e5e000c00d291 100644 (file)
--- a/t/t5411/test-0024-report-unknown-ref.sh
+++ b/t/t5411/test-0024-report-unknown-ref.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
index 99601ca321f1ceeac4141007f9e3f5cd32a4295f..8b3f5d05a3fab60ac70a88a019978ccd02bbb9f2 100644 (file)
--- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh
+++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
index fec5f95793bff3c55ea966e1c0355c52e081a618..6dfc7b1c0da421ac143c68005a90caf6a351fb76 100644 (file)
--- a/t/t5411/test-0026-push-options.sh
+++ b/t/t5411/test-0026-push-options.sh
@@ -1,6 +1,6 @@
 test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL)" '
        git -C "$upstream" config receive.advertisePushOptions false &&
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"
@@ -31,7 +31,7 @@ test_expect_success "enable push options ($PROTOCOL)" '
 '
 
 test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                --version 0 \
@@ -75,7 +75,7 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL)
 '
 
 test_expect_success "restore proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
index 8fb75a8789dc9be9a19d3623c3dedb4a7e82cc2c..768880b40fbdbbb072ed8b362ea638436583e066 100644 (file)
--- a/t/t5411/test-0027-push-options--porcelain.sh
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -1,6 +1,6 @@
 test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" '
        git -C "$upstream" config receive.advertisePushOptions false &&
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"
@@ -32,7 +32,7 @@ test_expect_success "enable push options ($PROTOCOL/porcelain)" '
 '
 
 test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                --version 0 \
@@ -78,7 +78,7 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL/
 '
 
 test_expect_success "restore proc-receive hook ($PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh
index a3a6278213c4cb4a870c78705ecdd5dbf0e1e1e3..0f190a6e851697aac05693097e32c5a79604c7fe 100644 (file)
--- a/t/t5411/test-0030-report-ok.sh
+++ b/t/t5411/test-0030-report-ok.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh
index 0e175388b6523394b5215d96b7d3be89d9ca92b5..7ec39812638a8775a10b03d428cc944ad782fa16 100644 (file)
--- a/t/t5411/test-0031-report-ok--porcelain.sh
+++ b/t/t5411/test-0031-report-ok--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic"

diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh
index 988a4302a67f5b8d4f5453852021614096441351..07733b94b81734085a80eb3273fd5f514755b035 100644 (file)
--- a/t/t5411/test-0032-report-with-options.sh
+++ b/t/t5411/test-0032-report-with-options.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "option refname refs/pull/123/head" \
@@ -30,7 +30,7 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)
 '
 
 test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -62,7 +62,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -95,7 +95,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
 '
 
 test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -129,7 +129,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)
 '
 
 test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -161,7 +161,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -195,7 +195,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)
 '
 
 test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/a/b/c/topic" \

diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh
index daacb3d69d4af4a18f5516b02f017efbe16f72cf..2e1831b104e8a98ab31f83fc9f9d2e4201d9feaa 100644 (file)
--- a/t/t5411/test-0033-report-with-options--porcelain.sh
+++ b/t/t5411/test-0033-report-with-options--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "option refname refs/pull/123/head" \
@@ -31,7 +31,7 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/
 '
 
 test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -64,7 +64,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)"
 '
 
 test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -99,7 +99,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
 '
 
 test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -134,7 +134,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/
 '
 
 test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -167,7 +167,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)"
 '
 
 test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -202,7 +202,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/
 '
 
 test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/a/b/c/topic" \

diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh
index 73a47d1ffdbf84a8c04a8d835991d46c57d584a6..0e37535065345b9aa756441a6cd7d022a9cc6754 100644 (file)
--- a/t/t5411/test-0034-report-ft.sh
+++ b/t/t5411/test-0034-report-ft.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \

diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh
index c3502011075ff974af142317e80e207ab545fb8f..b9a05181f1ac7ac3fa122d98165d2f5d84334a4e 100644 (file)
--- a/t/t5411/test-0035-report-ft--porcelain.sh
+++ b/t/t5411/test-0035-report-ft--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-\EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \

diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
index 8c8a6c16e10825bd5e16a7db20ac9b0af876a440..889e97057b856581ade7986d7f5da99412f45c7f 100644 (file)
--- a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
+++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
@@ -14,7 +14,7 @@ test_expect_success "setup git config for remote-tracking of special refs" '
 '
 
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -87,7 +87,7 @@ test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -162,7 +162,7 @@ test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \

diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
index bc44810f33a82a812ce5bb4d18f7e98f294a65d9..1e523b1c173c6619ae9177c86357b625587b5f79 100644 (file)
--- a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
+++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -58,7 +58,7 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for
 '
 
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \
@@ -119,7 +119,7 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for
 '
 
 test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/main/topic" \

diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh
index e63fe7ba1102dab2e75f586e29f149383c21b9a0..4c70e84e4101443c14ea4ccfadcfc689a9e2cd41 100644 (file)
--- a/t/t5411/test-0038-report-mixed-refs.sh
+++ b/t/t5411/test-0038-report-mixed-refs.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/next/topic2" \

diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
index 99d17b73afd03e8f50cf05b3ceee18f78687b635..40f4c5b1afba881a79a73caeb92e5190b8962088 100644 (file)
--- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh
+++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
@@ -1,5 +1,5 @@
 test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/for/next/topic2" \

diff --git a/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh
index 2f405adefa892b01f80d3291d993ba882fd7cf5b..7ae3851efb9231c2bff352728991bafe6c76b215 100644 (file)
--- a/t/t5411/test-0040-process-all-refs.sh
+++ b/t/t5411/test-0040-process-all-refs.sh
@@ -17,7 +17,7 @@ test_expect_success "setup upstream branches ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main" \

diff --git a/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh
index c88405792ef57c0ef79880ad7d1909496f471ae8..02e1e084d6c9c5c8f8e43e1104a54ff08dd20abc 100644 (file)
--- a/t/t5411/test-0041-process-all-refs--porcelain.sh
+++ b/t/t5411/test-0041-process-all-refs--porcelain.sh
@@ -17,7 +17,7 @@ test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" '
 '
 
 test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main" \

diff --git a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
index 31989f018501dab21738fdb92c81af8676662ed1..7efdfe5598722519b8c6706254d93f6462b29136 100644 (file)
--- a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
+++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
@@ -9,7 +9,7 @@ test_expect_success "config receive.procReceiveRefs with modifiers ($PROTOCOL)"
 '
 
 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main" \
@@ -70,7 +70,7 @@ test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" '
 '
 
 test_expect_success "setup proc-receive hook ($PROTOCOL)" '
-       write_script "$upstream/hooks/proc-receive" <<-EOF
+       test_hook -C "$upstream" --clobber proc-receive <<-EOF
        printf >&2 "# proc-receive hook\n"
        test-tool proc-receive -v \
                -r "ok refs/heads/main" \