dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-08 09:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

serve: advertise type capability

Browse Source 
The server and the client can handle type requests but the client won't
ask for it until the server advertises it.

Add type to the advertised capabilities so the client knows that it can
request it.

Mentored-by: Karthik Nayak <karthik.188@gmail.com>
Mentored-by: Chandra Pratap <chandrapratap3519@gmail.com>
Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pablo Sabater
2026-08-03 16:39:34 +02:00
committed by Junio C Hamano
parent 0f61542dbc
commit 1a1698d8c6
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
serve.c
View File

@@ -97,9 +97,9 @@ static int object_info_advertise(struct repository *r, struct strbuf *value)
/* disabled by default */
advertise_object_info = 0;
}
/* Currently only size is supported */
/* Currently only size and type are supported */
if (value && advertise_object_info)
strbuf_addstr(value, "size");
strbuf_addstr(value, "size type");
return advertise_object_info;
}

26
t/t1017-cat-file-remote-object-info.sh
View File

@@ -7,6 +7,7 @@ test_description='git cat-file --batch-command with remote-object-info command'
hello_content="Hello World"
hello_size=$(strlen "$hello_content")
hello_type="blob"
hello_oid=$(echo_without_newline "$hello_content" | git hash-object --stdin)
hello_short_oid=$(git rev-parse --short "$hello_oid")
@@ -19,6 +20,7 @@ unstored_oid=$(echo_without_newline "$unstored_content" | git hash-object --stdi
# file name is hello, which is 5 characters
# a space is 1 character and a null is 1 character
tree_size=$(($(test_oid rawsz) + 13))
tree_type="tree"
commit_message="Initial commit"
@@ -31,6 +33,7 @@ commit_message="Initial commit"
# An easier way to calculate is: 1. use `git cat-file commit <commit hash> | wc -c`,
# to get 177, 2. then deduct 40 hex characters to get 137
commit_size=$(($(test_oid hexsz) + 137))
commit_type="commit"
tag_header_without_oid="type blob
tag hellotag
@@ -44,6 +47,7 @@ $tag_description"
tag_oid=$(echo_without_newline "$tag_content" | git hash-object -t tag --stdin -w)
tag_size=$(strlen "$tag_content")
tag_type="tag"
set_transport_variables () {
hello_oid=$(echo_without_newline "$hello_content" | git hash-object --stdin)
@@ -256,14 +260,12 @@ test_expect_success 'remote-object-info does not die on missing oid like info' '
)
'
# This tests depends on %(objecttype) not being supported yet, once supported
# it needs to be updated.
test_expect_success 'unsupported placeholder on remote returns empty string' '
test_expect_success 'objecttype is supported by remote-object-info' '
(
set_transport_variables "$daemon_parent" &&
cd "$daemon_parent/daemon_client_empty" &&
echo "" >expect &&
echo "$hello_type" >expect &&
git cat-file --batch-command="%(objecttype)" >actual <<-EOF &&
remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid
EOF
@@ -271,6 +273,22 @@ test_expect_success 'unsupported placeholder on remote returns empty string' '
)
'
test_expect_success 'unsupported placeholders on remote return empty string' '
(
set_transport_variables "$daemon_parent" &&
cd "$daemon_parent/daemon_client_empty" &&
fmt="%(objectmode) %(objectsize:disk) %(rest) %(deltabase)" &&
# The hardcoded SPs between the atoms are respected.
echo " " >expect &&
git cat-file --batch-command="$fmt" >actual <<-EOF &&
remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid
EOF
test_cmp expect actual
)
'
test_expect_success 'requesting only objectname echoes back' '
(
set_transport_variables "$daemon_parent" &&