Merge branch 'nd/gc-lock-against-each-other'

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 54dbbfe5ceeb9bf91cdad3393c2fdfe95c06fd18..ad8f1ef71efcd7e449d2cad8edd3cf80c98ca188 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -204,7 +204,8 @@ set_askpass() {
 }
 
 expect_askpass() {
-       dest=$HTTPD_DEST
+       dest=$HTTPD_DEST${3+/$3}
+
        {
                case "$1" in
                none)