Merge branch 'jc/daemon-no-ipv6-for-2.4.1'

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 5aa8adcf9c8a53b8a643a37b9474886448f6a45b..75482254a3e72a65640c6805abd028e2b7bd0e2f 100644 (file)
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -69,7 +69,7 @@ start_p4d() {
        (
                cd "$db" &&
                {
-                       p4d -q -p $P4DPORT &
+                       p4d -q -p $P4DPORT "$@" &
                        echo $! >"$pidfile"
                }
        ) &&