tests: document cherry-pick behavior in face of conflicts

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 0e69324652026bdeeb319c36782fe1130b0510a1..8cfce969bcdac6e2091e635dad9c58ca616e5c3b 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='test fetching over http'
+test_description='test dumb fetching over http via static file'
 . ./test-lib.sh
 
 if test -n "$NO_CURL"; then
@@ -30,7 +30,7 @@ test_expect_success 'create http-accessible bare repository' '
 '
 
 test_expect_success 'clone http repository' '
-       git clone $HTTPD_URL/repo.git clone &&
+       git clone $HTTPD_URL/dumb/repo.git clone &&
        test_cmp file clone/file
 '
 
@@ -58,7 +58,13 @@ test_expect_success 'fetch packed objects' '
        cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
        git --bare repack &&
        git --bare prune-packed &&
-       git clone $HTTPD_URL/repo_pack.git
+       git clone $HTTPD_URL/dumb/repo_pack.git
+'
+
+test_expect_success 'did not use upload-pack service' '
+       grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act
+       : >exp
+       test_cmp exp act
 '
 
 stop_httpd