Merge branch 'cb/fetch-set-upstream'

diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 6d1d59c9b1af8c1ca7d6e78c8a589395ff971338..04b34c4de19f858c530e6944822d778c26391a72 100755 (executable)
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -278,4 +278,7 @@ test_expect_success 'push options keep quoted characters intact (http)' '
        test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done