Signed-off-by: Teng Long <tenglong@xxxxxxxxxxxxxxx>
---
t/t5702-protocol-v2.sh | 213 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 213 insertions(+)
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 6e323253f7..762a9c2505 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -1267,6 +1267,219 @@ test_expect_success 'commit-exclusion(excluding_type=ET_REACHABLE): part of pack
test_line_count = 4 filelist
'
+test_expect_success 'tree-exclusion(excluding_type=ET_SELF): part of packfile response provided as URI' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log *found" &&
+ excluding_type="0" &&
+ 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" new 0 >h &&
+ configure_exclusion tree "$P" "$othertreeh" new 0 >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 = 1 out.objectlist
+ then
+ if grep $mytreeh out
+ then
+ >mytreehfound
+ fi &&
+ if grep $othertreeh out
+ then
+ >othertreehfound
+ fi
+ elif test_line_count = 7 out.objectlist
+ then
+ if grep $commith out
+ then
+ >commithfound
+ fi &&
+ if grep $roottreeh out
+ then
+ >roottreehfound
+ fi &&
+ if grep $subtreeh out
+ then
+ >subtreehfound
+ fi &&
+ if grep $ah out
+ then
+ >ahfound
+ fi &&
+ if grep $myblobh out
+ then
+ >myblobhfound
+ fi &&
+ if grep $otherblobh out
+ then
+ >otherblobhfound
+ 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 'tree-exclusion(excluding_type=ET_INCLUDE), part of packfile response provided as URI' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log *found" &&
+ excluding_type="1" &&
+ 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" new $excluding_type >h &&
+ configure_exclusion tree "$P" "$othertreeh" new $excluding_type >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 'fetching with valid packfile URI but invalid hash fails' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_when_finished "rm -rf \"$P\" http_child log" &&
--
2.31.1.453.g945ddc3a74.dirty
