Signed-off-by: Teng Long <dyroneteng@xxxxxxxxx>
---
t/t5702-protocol-v2.sh | 292 +++++++++++++++++++++++++++++++++++++----
1 file changed, 266 insertions(+), 26 deletions(-)
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index e6314b53b0..5ad52e0cee 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -824,17 +824,47 @@ 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"
+ oid="$3"
+ version="$4"
+
+ oldc="uploadpack.blobpackfileuri"
+ newc="uploadpack.excludeobject"
+ configkey=""
+
+ if test "$version" = "old"
+ then
+ configkey="$oldc"
+ else
+ configkey="$newc"
+ fi
+
+ if test "$objt" = "blob"
+ then
+ git -C "$P" hash-object "$oid" >objh &&
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+ git -C "$P" config --add \
+ "$configkey" \
+ "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ cat objh
+ elif test "$objt" = "commit" || test "$objt" = "tree" || test "$objt" = "tag"
+ then
+ echo "$oid" >objh
+ git -C "$P" pack-objects --revs "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh
+ git -C "$P" config --add \
+ "$configkey" \
+ "$(cat objh) $(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' '
+part_of_packfile_response_verify() {
+ config="$1"
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- test_when_finished "rm -rf \"$P\" http_child log" &&
+ test_when_finished "rm -rf \"$P\" http_child log *found" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -843,10 +873,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 config >h &&
+ configure_exclusion blob "$P" other-blob config >h2 &&
GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
git -c protocol.version=2 \
@@ -879,9 +909,11 @@ test_expect_success 'part of packfile response provided as URI' '
ls http_child/.git/objects/pack/*.pack \
http_child/.git/objects/pack/*.idx >filelist &&
test_line_count = 6 filelist
-'
+}
+
+blobpackfileuri_fetch () {
+ config="$1"
-test_expect_success 'packfile URIs with fetch instead of clone' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_when_finished "rm -rf \"$P\" http_child log" &&
@@ -890,9 +922,9 @@ test_expect_success 'packfile URIs with fetch instead of clone' '
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 $config >h &&
git init http_child &&
@@ -900,6 +932,215 @@ test_expect_success 'packfile URIs with fetch instead of clone' '
git -C http_child -c protocol.version=2 \
-c fetch.uriprotocols=http,https \
fetch "$HTTPD_URL/smart/http_parent"
+}
+
+test_expect_success 'blob-exclusion (using uploadpack.blobpackfileuri): part of packfile response provided as URI' '
+ part_of_packfile_response_verify old
+'
+
+test_expect_success 'blob-exclusion (using uploadpack.excludeobject): part of packfile response provided as URI' '
+ part_of_packfile_response_verify new
+'
+
+test_expect_success 'blob-exclusion (using uploadpack.blobpackfileuri): packfile URIs with fetch instead of clone' '
+ blobpackfileuri_fetch old
+'
+
+test_expect_success 'blob-exclusion (using uploadpack.excludeobject): packfile URIs with fetch instead of clone' '
+ blobpackfileuri_fetch new
+'
+
+test_expect_success 'tree-exclusion: part of packfile response provided as URI' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log *found" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ # Dir struct
+ # .
+ # |-- A.t
+ # |-- my-tree
+ # | `-- my-blob
+ # `-- other-tree
+ # |-- other-blob
+ # `-- sub-tree
+ # `-- sub-blob
+ mkdir "$P"/my-tree &&
+ echo my-blob >"$P"/my-tree/my-blob &&
+ git -C "$P" add my-tree &&
+ mkdir "$P"/other-tree &&
+ echo other-blob >"$P"/other-tree/other-blob &&
+ mkdir "$P"/other-tree/sub-tree &&
+ echo sub-blob >"$P"/other-tree/sub-tree/sub-blob &&
+ git -C "$P" add other-tree &&
+ test_commit -C "$P" A &&
+
+ commith=$(git -C "$P" rev-parse A) &&
+ roottreeh=$(git -C "$P" rev-parse A:) &&
+ ah=$(git -C "$P" hash-object A.t) &&
+ mytreeh=$(git -C "$P" ls-tree HEAD my-tree | sed -ne "s/.*\($OID_REGEX\).*/\1/p") &&
+ othertreeh=$(git -C "$P" ls-tree HEAD other-tree | sed -ne "s/.*\($OID_REGEX\).*/\1/p") &&
+ subtreeh=$(git -C "$P" ls-tree HEAD other-tree/sub-tree | sed -ne "s/.*\($OID_REGEX\).*/\1/p") &&
+ myblobh=$(git -C "$P" hash-object my-tree/my-blob) &&
+ otherblobh=$(git -C "$P" hash-object other-tree/other-blob) &&
+ subblobh=$(git -C "$P" hash-object other-tree/sub-tree/sub-blob) &&
+
+ configure_exclusion tree "$P" "$mytreeh" config >h &&
+ configure_exclusion tree "$P" "$othertreeh" config >h2 &&
+
+ GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
+ git -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+ # Ensure that my-tree and other-tree and theirs complementary set are in separate packfiles.
+ for idx in http_child/.git/objects/pack/*.idx
+ do
+ git verify-pack --object-format=$(test_oid algo) --verbose $idx >out &&
+ {
+ grep "^[0-9a-f]\{16,\} " out || :
+ } >out.objectlist &&
+ if test_line_count = 3 out.objectlist
+ then
+ if grep $commith out
+ then
+ >commithfound
+ fi &&
+ if grep $roottreeh out
+ then
+ >roottreehfound
+ fi &&
+ if grep $ah out
+ then
+ >ahfound
+ fi
+ elif test_line_count = 2 out.objectlist
+ then
+ if grep $mytreeh out
+ then
+ >mytreehfound
+ fi &&
+ if grep $myblobh out
+ then
+ >myblobhfound
+ fi
+ elif test_line_count = 4 out.objectlist
+ then
+ if grep $othertreeh out
+ then
+ >othertreehfound
+ fi &&
+ if grep $otherblobh out
+ then
+ >otherblobhfound
+ fi
+ if grep $subtreeh out
+ then
+ >subtreehfound
+ fi &&
+ if grep $subblobh out
+ then
+ >subblobhfound
+ fi
+ fi
+ done &&
+ test -f mytreehfound &&
+ test -f myblobhfound &&
+ test -f othertreehfound &&
+ test -f otherblobhfound &&
+ test -f subtreehfound &&
+ test -f subblobhfound &&
+ test -f commithfound &&
+ test -f roottreehfound &&
+ test -f ahfound &&
+
+ # Ensure that there are exactly 3 packfiles with associated .idx
+ ls http_child/.git/objects/pack/*.pack \
+ http_child/.git/objects/pack/*.idx >filelist &&
+ test_line_count = 6 filelist
+'
+
+test_expect_success 'commit-exclusion: part of packfile response provided as URI' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log *found" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ mkdir "$P"/my-tree &&
+ echo my-blob >"$P"/my-tree/my-blob &&
+ git -C "$P" add my-tree &&
+ mkdir "$P"/my-tree/sub-tree &&
+ echo sub-blob >"$P"/my-tree/sub-tree/sub-blob &&
+ git -C "$P" add my-tree &&
+ test_commit -C "$P" A &&
+
+ commith=$(git -C "$P" rev-parse A) &&
+ roottreeh=$(git -C "$P" rev-parse A:) &&
+ mytreeh=$(git -C "$P" ls-tree HEAD my-tree | sed -ne "s/.*\($OID_REGEX\).*/\1/p") &&
+ subtreeh=$(git -C "$P" ls-tree HEAD my-tree/sub-tree | sed -ne "s/.*\($OID_REGEX\).*/\1/p") &&
+ ah=$(git -C "$P" hash-object A.t) &&
+ myblobh=$(git -C "$P" hash-object my-tree/my-blob) &&
+ subblobh=$(git -C "$P" hash-object my-tree/sub-tree/sub-blob) &&
+
+ configure_exclusion commit "$P" "$commith" >h &&
+
+ GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
+ git -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+ for idx in http_child/.git/objects/pack/*.idx
+ do
+ git verify-pack --object-format=$(test_oid algo) --verbose $idx >out &&
+ {
+ grep "^[0-9a-f]\{16,\} " out || :
+ } >out.objectlist &&
+ if test_line_count = 7 out.objectlist
+ then
+ if grep $commith out
+ then
+ >commithfound
+ fi &&
+ if grep $roottreeh out
+ then
+ >roottreehfound
+ fi &&
+ if grep $ah out
+ then
+ >ahfound
+ fi &&
+ if grep $mytreeh out
+ then
+ >mytreehfound
+ fi &&
+ if grep $myblobh out
+ then
+ >myblobhfound
+ fi &&
+ if grep $subtreeh out
+ then
+ >subtreehfound
+ fi &&
+ if grep $subblobh out
+ then
+ >subblobhfound
+ fi
+ fi
+ done &&
+ test -f mytreehfound &&
+ test -f myblobhfound &&
+ test -f subtreehfound &&
+ test -f subblobhfound &&
+ test -f commithfound &&
+ test -f roottreehfound &&
+ test -f ahfound &&
+
+ # Ensure that there are exactly 2 packfiles with associated .idx
+ ls http_child/.git/objects/pack/*.pack \
+ http_child/.git/objects/pack/*.idx >filelist &&
+ test_line_count = 4 filelist
'
test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
@@ -913,9 +1154,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 >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,7 +1164,7 @@ 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" \
+ "uploadpack.excludeobject" \
"$(cat objh) $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
test_must_fail env GIT_TEST_SIDEBAND_ALL=1 \
@@ -942,9 +1183,8 @@ test_expect_success 'packfile-uri with transfer.fsckobjects' '
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 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -976,9 +1216,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 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -1000,7 +1240,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 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -1024,9 +1264,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 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
--
2.31.1.449.gb2aa5456a8.dirty
