Modify the logic of configure_exclusion to support the processing of
commits objects and add test cases for excluding commit objects
(recursive and non-recursive).
Replace "rm..." in the original test with "test_when_finished...".
Replace "git commit..." in the original test with "test_commit...".
Signed-off-by: Teng Long <dyroneteng@xxxxxxxxx>
---
t/t5702-protocol-v2.sh | 145 +++++++++++++++++++++++++++++++----------
1 file changed, 111 insertions(+), 34 deletions(-)
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 2e1243ca40..2148bfcda1 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -753,7 +753,7 @@ test_expect_success 'ls-remote with v2 http sends only one POST' '
'
test_expect_success 'push with http:// and a config of v2 does not request v2' '
- test_when_finished "rm -f log" &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child log" &&
# Till v2 for push is designed, make sure that if a client has
# protocol.version configured to use v2, that the client instead falls
# back and uses v0.
@@ -776,7 +776,7 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
'
test_expect_success 'when server sends "ready", expect DELIM' '
- rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child" &&
git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
@@ -796,7 +796,7 @@ test_expect_success 'when server sends "ready", expect DELIM' '
'
test_expect_success 'when server does not send "ready", expect FLUSH' '
- rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child log &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child log" &&
git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
@@ -824,17 +824,39 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
'
configure_exclusion () {
- git -C "$1" hash-object "$2" >objh &&
- git -C "$1" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
- git -C "$1" config --add \
- "uploadpack.blobpackfileuri" \
- "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
- cat objh
+ objt="$1"
+ P="$2"
+ recursive="$4"
+
+ if test "$objt" = "blob"
+ then
+ git -C "$P" hash-object "$3" >objh &&
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+ git -C "$P" config --add \
+ "uploadpack.excludeobject" \
+ "$(cat objh) $recursive $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ cat objh
+ elif test "$objt" = "commit"
+ then
+ echo "$3" >objh
+ if test "$recursive" = 0
+ then
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh
+ else
+ git -C "$2" pack-objects --revs "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh
+ fi
+ git -C "$P" config --add \
+ "uploadpack.excludeobject" \
+ "$(cat objh) $recursive $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ cat objh
+ else
+ echo "unsupported object type in configure_exclusion (got $objt)"
+ fi
}
test_expect_success 'part of packfile response provided as URI' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -843,10 +865,10 @@ test_expect_success 'part of packfile response provided as URI' '
git -C "$P" add my-blob &&
echo other-blob >"$P/other-blob" &&
git -C "$P" add other-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
- configure_exclusion "$P" other-blob >h2 &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
+ configure_exclusion blob "$P" other-blob 0 >h2 &&
GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
git -c protocol.version=2 \
@@ -881,18 +903,18 @@ test_expect_success 'part of packfile response provided as URI' '
test_line_count = 6 filelist
'
-test_expect_success 'packfile URIs with fetch instead of clone' '
+test_expect_success 'blobs packfile URIs with fetch instead of clone' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
git init http_child &&
@@ -902,9 +924,65 @@ test_expect_success 'packfile URIs with fetch instead of clone' '
fetch "$HTTPD_URL/smart/http_parent"
'
+test_expect_success 'commits(not recursively) packfile URIs with fetch instead of clone' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ test_commit -C "$P" A &&
+
+ mycommit=$(git -C "$P" rev-parse A) &&
+ echo other-blob >"$P/other-blob" &&
+ git -C "$P" add other-blob &&
+ test_commit -C "$P" B &&
+ othercommit=$(git -C "$P" rev-parse B) &&
+
+ configure_exclusion commit "$P" "$mycommit" 0 >h &&
+ configure_exclusion commit "$P" "$othercommit" 0 >h2 &&
+
+ git init http_child &&
+
+ GIT_TRACE=1 GIT_TEST_SIDEBAND_ALL=1 \
+ git -C http_child -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ fetch "$HTTPD_URL/smart/http_parent"
+'
+
+test_expect_success 'commits(recursively) packfile URIs with fetch instead of clone' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ test_commit -C "$P" A &&
+
+ mycommit=$(git -C "$P" rev-parse A) &&
+ echo other-blob >"$P/other-blob" &&
+ git -C "$P" add other-blob &&
+ test_commit -C "$P" B &&
+ othercommit=$(git -C "$P" rev-parse B) &&
+
+ configure_exclusion commit "$P" "$mycommit" 1 >h2 &&
+ configure_exclusion commit "$P" "$othercommit" 1 >h2 &&
+
+ git init http_child &&
+
+ GIT_TRACE=1 GIT_TEST_SIDEBAND_ALL=1 \
+ git -C http_child -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ fetch "$HTTPD_URL/smart/http_parent"
+'
+
test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -913,9 +991,9 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
git -C "$P" add my-blob &&
echo other-blob >"$P/other-blob" &&
git -C "$P" add other-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
# Configure a URL for other-blob. Just reuse the hash of the object as
# the hash of the packfile, since the hash does not matter for this
# test as long as it is not the hash of the pack, and it is of the
@@ -923,8 +1001,8 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
git -C "$P" hash-object other-blob >objh &&
git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
git -C "$P" config --add \
- "uploadpack.blobpackfileuri" \
- "$(cat objh) $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ "uploadpack.excludeobject" \
+ "$(cat objh) 0 $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
test_must_fail env GIT_TEST_SIDEBAND_ALL=1 \
git -c protocol.version=2 \
@@ -935,16 +1013,15 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
test_expect_success 'packfile-uri with transfer.fsckobjects' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
-
- configure_exclusion "$P" my-blob >h &&
+ test_commit -C "$P" A &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -959,7 +1036,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects' '
test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -976,9 +1053,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object'
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -989,7 +1066,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object'
test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmodules is separate from tree' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child &&
+ test_when_finished "rm -rf \"$P\" http_child" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -1000,7 +1077,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmo
git -C "$P" add .gitmodules &&
git -C "$P" commit -m x &&
- configure_exclusion "$P" .gitmodules >h &&
+ configure_exclusion blob "$P" .gitmodules 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -1015,7 +1092,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmo
test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodules separate from tree is invalid' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child err &&
+ test_when_finished "rm -rf \"$P\" http_child err" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -1024,9 +1101,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodul
echo "path = include/foo" >>"$P/.gitmodules" &&
echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
git -C "$P" add .gitmodules &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" .gitmodules >h &&
+ configure_exclusion blob "$P" .gitmodules 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
--
2.31.1.442.g7e39198978.dirty
