git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH GSoC v3 8/8] cat-file: unify default format

From
Pablo Sabater <pabloosabaterr@gmail.com>
Date
Aug 3, 2026, 14:39 UTC
Message-ID
<20260803-objecttype-support-v3-8-7176fecf7950@gmail.com>
In-Reply-To
<20260803-objecttype-support-v3-0-7176fecf7950@gmail.com>

%(objecttype) is supported both by the client and by the server. Change the temporary default format to the unified version that the other commands use.

Update documentation to remove %(objecttype) from the caveats of remote-object-info and show %(objecttype) support.

Now that type is supported and the default format unified, update the tests to expect the new default format.

Mentored-by: Karthik Nayak <karthik.188@gmail.com>
Mentored-by: Chandra Pratap <chandrapratap3519@gmail.com>
Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com>
---
 Documentation/git-cat-file.adoc        | 17 +++++------
 Documentation/gitprotocol-v2.adoc      | 18 +++++++++---
 builtin/cat-file.c                     |  7 -----
 t/t1017-cat-file-remote-object-info.sh | 52 +++++++++++++++++-----------------
 4 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/Documentation/git-cat-file.adoc b/Documentation/git-cat-file.adoc
index ac3b528c6f..514bfc0032 100644
--- a/Documentation/git-cat-file.adoc
+++ b/Documentation/git-cat-file.adoc
@@ -348,15 +348,12 @@ newline. The available atoms are:
 	after that first run of whitespace (i.e., the "rest" of the
 	line) are output in place of the `%(rest)` atom.
 
-The command `remote-object-info` only supports the `%(objectname)` and
-`%(objectsize)` placeholders. See `CAVEATS` below for more information.
+The command `remote-object-info` only supports the `%(objectname)`,
+`%(objectsize)` and `%(objecttype)` placeholders. See `CAVEATS` below for more
+information.
 
 If no format is specified, the default format is `%(objectname)
-%(objecttype) %(objectsize)`, except for `remote-object-info` commands which
-use `%(objectname) %(objectsize)` because `%(objecttype)` is not supported yet.
-
-WARNING: When "%(objecttype)" is supported, the default format WILL be unified,
-so DO NOT RELY on the current default format to stay the same!!!
+%(objecttype) %(objectsize)`.
 
 If `--batch` is specified, or if `--batch-command` is used with the `contents`
 command, the object information is followed by the object contents (consisting
@@ -453,9 +450,9 @@ scripting purposes.
 CAVEATS
 -------
 
-Note that only `%(objectname)` and `%(objectsize)` are currently
-supported by the `remote-object-info` command. Using any other placeholder in
-the format string will return an empty string in its position.
+Note that only `%(objectname)`, `%(objectsize)` and `%(objecttype)` are
+currently supported by the `remote-object-info` command. Using any other
+placeholder in the format string will return an empty string in its position.
 
 Note that the sizes of objects on disk are reported accurately, but care
 should be taken in drawing conclusions about which refs or objects are
diff --git a/Documentation/gitprotocol-v2.adoc b/Documentation/gitprotocol-v2.adoc
index 7bf62014c3..dd52fd8110 100644
--- a/Documentation/gitprotocol-v2.adoc
+++ b/Documentation/gitprotocol-v2.adoc
@@ -558,14 +558,17 @@ object-info
 
 `object-info` is the command to retrieve information about one or more objects.
 Its main purpose is to allow a client to make decisions based on this
-information without having to fully fetch objects. Object size is the only
-information that is currently supported.
+information without having to fully fetch objects. Currently only object size
+and type are supported.
 
 An `object-info` request takes the following arguments:
 
 	size
 	Requests size information to be returned for each listed object id.
 
+	type
+	Requests type information to be returned for each listed object id.
+
 	oid <oid>
 	Indicates to the server an object which the client wants to obtain
 	information for. They must be full OIDs.
@@ -580,11 +583,18 @@ space.
 	info = *PKT-LINE(attr LF)
 	       *PKT-LINE(obj-info LF)
 
-	attr = "size"
+	attr = "size" | "type"
 
 	obj-size = 1*DIGIT
 
-	obj-info = obj-id [SP [obj-size]]
+	obj-type = "blob" | "tree" | "commit" | "tag"
+
+	obj-val = obj-size | obj-type
+
+	obj-info = obj-id [SP [obj-val *(SP obj-val)]]
+
+The values in `obj-info` appear in the same order as the corresponding `attr`
+lines, with exactly one value per requested attribute.
 
 If the server does not recognize the OID, the response will be `<oid> SP`
 regardless of the number of attributes requested.
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 7a3ae11a70..867079a62e 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -823,15 +823,9 @@ static void parse_cmd_remote_object_info(struct batch_options *opt,
 	char *line_to_split;
 	struct fetch_object_info_results results = FETCH_OBJECT_INFO_RESULTS_INIT;
 	struct oid_array object_info_oids = OID_ARRAY_INIT;
-	const char *saved_format = opt->format;
 
 	if (strlen(line) >= MAX_REMOTE_OBJ_INFO_LINE)
 		die(_("remote-object-info command too long"));
-	/*
-	 * TODO: Use the default format once %(objecttype) is supported.
-	 */
-	if (!opt->format)
-		opt->format = "%(objectname) %(objectsize)";
 
 	line_to_split = xstrdup(line);
 	count = split_cmdline(line_to_split, &argv);
@@ -883,7 +877,6 @@ static void parse_cmd_remote_object_info(struct batch_options *opt,
 		data->is_remote = 0;
 	}
 	data->skip_object_info = 0;
-	opt->format = saved_format;
 
 	free_fetch_object_info_results(&results);
 	free(line_to_split);
diff --git a/t/t1017-cat-file-remote-object-info.sh b/t/t1017-cat-file-remote-object-info.sh
index 190c45eefc..e2919aa061 100755
--- a/t/t1017-cat-file-remote-object-info.sh
+++ b/t/t1017-cat-file-remote-object-info.sh
@@ -139,10 +139,10 @@ test_expect_success 'batch-command remote-object-info git:// default filter' '
 		set_transport_variables "$daemon_parent" &&
 		cd "$daemon_parent/daemon_client_empty" &&
 
-		echo "$hello_oid $hello_size" >expect &&
-		echo "$tree_oid $tree_size" >>expect &&
-		echo "$commit_oid $commit_size" >>expect &&
-		echo "$tag_oid $tag_size" >>expect &&
+		echo "$hello_oid $hello_type $hello_size" >expect &&
+		echo "$tree_oid $tree_type $tree_size" >>expect &&
+		echo "$commit_oid $commit_type $commit_size" >>expect &&
+		echo "$tag_oid $tag_type $tag_size" >>expect &&
 
 		git cat-file --batch-command >actual <<-EOF &&
 		remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid $tree_oid
@@ -152,7 +152,7 @@ test_expect_success 'batch-command remote-object-info git:// default filter' '
 	)
 '
 
-test_expect_success 'remote-object-info does not change the default format of info' '
+test_expect_success 'remote-object-info and info can be mixed using the unified default format' '
 	(
 		set_transport_variables "$daemon_parent" &&
 		cd "$daemon_parent/daemon_client_empty" &&
@@ -162,7 +162,7 @@ test_expect_success 'remote-object-info does not change the default format of in
 		local_size=$(strlen "$local_content") &&
 
 		echo "$local_oid blob $local_size" >expect &&
-		echo "$hello_oid $hello_size" >>expect &&
+		echo "$hello_oid blob $hello_size" >>expect &&
 		echo "$local_oid blob $local_size" >>expect &&
 
 		git cat-file --batch-command >actual <<-EOF &&
@@ -209,10 +209,10 @@ test_expect_success 'batch-command -Z remote-object-info git:// default filter'
 		set_transport_variables "$daemon_parent" &&
 		cd "$daemon_parent/daemon_client_empty" &&
 
-		printf "%s\0" "$hello_oid $hello_size" >expect &&
-		printf "%s\0" "$tree_oid $tree_size" >>expect &&
-		printf "%s\0" "$commit_oid $commit_size" >>expect &&
-		printf "%s\0" "$tag_oid $tag_size" >>expect &&
+		printf "%s\0" "$hello_oid $hello_type $hello_size" >expect &&
+		printf "%s\0" "$tree_oid $tree_type $tree_size" >>expect &&
+		printf "%s\0" "$commit_oid $commit_type $commit_size" >>expect &&
+		printf "%s\0" "$tag_oid $tag_type $tag_size" >>expect &&
 
 		printf "%s\0" "$hello_oid missing" >>expect &&
 		printf "%s\0" "$tree_oid missing" >>expect &&
@@ -448,10 +448,10 @@ test_expect_success 'batch-command remote-object-info file:// default filter' '
 		server_path="$(pwd)/server" &&
 		cd file_client_empty &&
 
-		echo "$hello_oid $hello_size" >expect &&
-		echo "$tree_oid $tree_size" >>expect &&
-		echo "$commit_oid $commit_size" >>expect &&
-		echo "$tag_oid $tag_size" >>expect &&
+		echo "$hello_oid $hello_type $hello_size" >expect &&
+		echo "$tree_oid $tree_type $tree_size" >>expect &&
+		echo "$commit_oid $commit_type $commit_size" >>expect &&
+		echo "$tag_oid $tag_type $tag_size" >>expect &&
 
 		git cat-file --batch-command >actual <<-EOF &&
 		remote-object-info "file://${server_path}" $hello_oid $tree_oid
@@ -467,10 +467,10 @@ test_expect_success 'batch-command -Z remote-object-info file:// default filter'
 		server_path="$(pwd)/server" &&
 		cd file_client_empty &&
 
-		printf "%s\0" "$hello_oid $hello_size" >expect &&
-		printf "%s\0" "$tree_oid $tree_size" >>expect &&
-		printf "%s\0" "$commit_oid $commit_size" >>expect &&
-		printf "%s\0" "$tag_oid $tag_size" >>expect &&
+		printf "%s\0" "$hello_oid $hello_type $hello_size" >expect &&
+		printf "%s\0" "$tree_oid $tree_type $tree_size" >>expect &&
+		printf "%s\0" "$commit_oid $commit_type $commit_size" >>expect &&
+		printf "%s\0" "$tag_oid $tag_type $tag_size" >>expect &&
 
 		printf "%s\0" "$hello_oid missing" >>expect &&
 		printf "%s\0" "$tree_oid missing" >>expect &&
@@ -618,10 +618,10 @@ test_expect_success 'batch-command remote-object-info http:// default filter' '
 		set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
 		cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" &&
 
-		echo "$hello_oid $hello_size" >expect &&
-		echo "$tree_oid $tree_size" >>expect &&
-		echo "$commit_oid $commit_size" >>expect &&
-		echo "$tag_oid $tag_size" >>expect &&
+		echo "$hello_oid $hello_type $hello_size" >expect &&
+		echo "$tree_oid $tree_type $tree_size" >>expect &&
+		echo "$commit_oid $commit_type $commit_size" >>expect &&
+		echo "$tag_oid $tag_type $tag_size" >>expect &&
 
 		git cat-file --batch-command >actual <<-EOF &&
 		remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid $tree_oid
@@ -636,10 +636,10 @@ test_expect_success 'batch-command -Z remote-object-info http:// default filter'
 		set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
 		cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" &&
 
-		printf "%s\0" "$hello_oid $hello_size" >expect &&
-		printf "%s\0" "$tree_oid $tree_size" >>expect &&
-		printf "%s\0" "$commit_oid $commit_size" >>expect &&
-		printf "%s\0" "$tag_oid $tag_size" >>expect &&
+		printf "%s\0" "$hello_oid $hello_type $hello_size" >expect &&
+		printf "%s\0" "$tree_oid $tree_type $tree_size" >>expect &&
+		printf "%s\0" "$commit_oid $commit_type $commit_size" >>expect &&
+		printf "%s\0" "$tag_oid $tag_type $tag_size" >>expect &&
 
 		batch_input="remote-object-info $HTTPD_URL/smart/http_parent $hello_oid $tree_oid
 remote-object-info $HTTPD_URL/smart/http_parent $commit_oid $tag_oid

-- 
2.54.0
Previous: Pablo SabaterNext: Pablo Sabater
Message 67 of 112 in “cat-file: extend remote-object-info to support %(objecttype)”
  1. 0/5 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Jul 25, 2026
  2. 1/5 protocol-caps: add type support to object-infoPablo Sabater, Jul 25, 2026
  3. Chandra PratapJul 29, 2026
  4. Pablo SabaterJul 29, 2026
  5. Junio C HamanoJul 29, 2026
  6. Karthik NayakJul 29, 2026
  7. 2/5 fetch-object-info: parse type from server responsePablo Sabater, Jul 25, 2026
  8. Chandra PratapJul 29, 2026
  9. Pablo SabaterJul 29, 2026
  10. Chandra PratapJul 29, 2026
  11. Karthik NayakJul 29, 2026
  12. Karthik NayakJul 29, 2026
  13. 3/5 fetch-object-info: request all supported options dynamicallyPablo Sabater, Jul 25, 2026
  14. Chandra PratapJul 29, 2026
  15. Pablo SabaterJul 29, 2026
  16. 4/5 serve: advertise type capabilityPablo Sabater, Jul 25, 2026
  17. Chandra PratapJul 29, 2026
  18. Pablo SabaterJul 29, 2026
  19. 5/5 cat-file: unify default formatPablo Sabater, Jul 25, 2026
  20. Chandra PratapJul 29, 2026
  21. Pablo SabaterJul 29, 2026
  22. Chandra PratapJul 29, 2026
  23. Pablo SabaterJul 29, 2026
  24. 0/6 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Jul 31, 2026
  25. 1/6 fetch-object-info: request all supported options dynamicallyPablo Sabater, Jul 31, 2026
  26. Junio C HamanoJul 31, 2026
  27. 2/6 t5701: use the test_file_size() helperPablo Sabater, Jul 31, 2026
  28. Junio C HamanoAug 1, 2026
  29. Pablo SabaterAug 1, 2026
  30. 3/6 protocol-caps: add type support to object-infoPablo Sabater, Jul 31, 2026
  31. Junio C HamanoAug 1, 2026
  32. 4/6 fetch-object-info: parse type from server responsePablo Sabater, Jul 31, 2026
  33. Junio C HamanoAug 1, 2026
  34. Junio C HamanoAug 1, 2026
  35. Pablo SabaterAug 1, 2026
  36. Jeff KingAug 1, 2026
  37. Jeff KingAug 1, 2026
  38. Junio C HamanoAug 2, 2026
  39. Pablo SabaterAug 2, 2026
  40. Jeff KingAug 2, 2026
  41. Junio C HamanoAug 2, 2026
  42. Junio C HamanoAug 2, 2026
  43. Jeff KingAug 2, 2026
  44. Junio C HamanoAug 2, 2026
  45. Pablo SabaterAug 1, 2026
  46. 5/6 serve: advertise type capabilityPablo Sabater, Jul 31, 2026
  47. Chandra PratapAug 1, 2026
  48. Pablo SabaterAug 1, 2026
  49. 6/6 cat-file: unify default formatPablo Sabater, Jul 31, 2026
  50. 0/8 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Aug 3, 2026
  51. 1/8 t5701: use test_file_size() to get the size of a filePablo Sabater, Aug 3, 2026
  52. Junio C HamanoAug 3, 2026
  53. Pablo SabaterAug 3, 2026
  54. 2/8 fetch-object-info: detect truncated server responsesPablo Sabater, Aug 3, 2026
  55. Junio C HamanoAug 3, 2026
  56. Pablo SabaterAug 3, 2026
  57. 3/8 fetch-object-info: pass arguments directly instead of a structPablo Sabater, Aug 3, 2026
  58. Junio C HamanoAug 3, 2026
  59. Karthik NayakAug 4, 2026
  60. Pablo SabaterAug 4, 2026
  61. 4/8 fetch-object-info: use dedicated struct for the resultsPablo Sabater, Aug 3, 2026
  62. Junio C HamanoAug 3, 2026
  63. Pablo SabaterAug 3, 2026
  64. 5/8 protocol-caps: add type support to object-infoPablo Sabater, Aug 3, 2026
  65. 6/8 fetch-object-info: parse type from server responsePablo Sabater, Aug 3, 2026
  66. 7/8 serve: advertise type capabilityPablo Sabater, Aug 3, 2026
  67. 8/8 cat-file: unify default formatPablo Sabater, Aug 3, 2026
  68. 0/9 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Aug 4, 2026
  69. 1/9 t5701: use test_file_size() to get the size of a filePablo Sabater, Aug 4, 2026
  70. 2/9 fetch-object-info: detect malformed server responsesPablo Sabater, Aug 4, 2026
  71. Junio C HamanoAug 4, 2026
  72. 3/9 fetch-object-info: pass arguments directly instead of a structPablo Sabater, Aug 4, 2026
  73. Junio C HamanoAug 4, 2026
  74. Karthik NayakAug 6, 2026
  75. 5/9 fetch-object-info: die() on the remaining error pathPablo Sabater, Aug 4, 2026
  76. 4/9 fetch-object-info: use dedicated struct for the resultsPablo Sabater, Aug 4, 2026
  77. Junio C HamanoAug 4, 2026
  78. Pablo SabaterAug 4, 2026
  79. 6/9 protocol-caps: add type support to object-infoPablo Sabater, Aug 4, 2026
  80. 7/9 fetch-object-info: parse type from server responsePablo Sabater, Aug 4, 2026
  81. 8/9 serve: advertise type capabilityPablo Sabater, Aug 4, 2026
  82. 9/9 cat-file: unify default formatPablo Sabater, Aug 4, 2026
  83. Jeff KingAug 6, 2026
  84. Pablo SabaterAug 7, 2026
  85. Jeff KingAug 7, 2026
  86. 00/10 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Aug 7, 2026
  87. 01/10 t5701: use test_file_size() to get the size of a filePablo Sabater, Aug 7, 2026
  88. 02/10 fetch-object-info: detect malformed server responsesPablo Sabater, Aug 7, 2026
  89. 03/10 fetch-object-info: pass arguments directly instead of a structPablo Sabater, Aug 7, 2026
  90. 04/10 fetch-object-info: use dedicated struct for the resultsPablo Sabater, Aug 7, 2026
  91. 05/10 fetch-object-info: die() on the remaining error pathPablo Sabater, Aug 7, 2026
  92. 06/10 transport: drop remote object-info fields from transport structPablo Sabater, Aug 7, 2026
  93. 07/10 protocol-caps: add type support to object-infoPablo Sabater, Aug 7, 2026
  94. 08/10 fetch-object-info: parse type from server responsePablo Sabater, Aug 7, 2026
  95. 09/10 serve: advertise type capabilityPablo Sabater, Aug 7, 2026
  96. 10/10 cat-file: unify default formatPablo Sabater, Aug 7, 2026
  97. Pablo SabaterAug 7, 2026
  98. 00/10 cat-file: extend remote-object-info to support %(objecttype)Pablo Sabater, Aug 8, 2026
  99. 01/10 t5701: use test_file_size() to get the size of a filePablo Sabater, Aug 8, 2026
  100. 02/10 fetch-object-info: detect malformed server responsesPablo Sabater, Aug 8, 2026
  101. 03/10 fetch-object-info: pass arguments directly instead of a structPablo Sabater, Aug 8, 2026
  102. 04/10 fetch-object-info: use dedicated struct for the resultsPablo Sabater, Aug 8, 2026
  103. 05/10 fetch-object-info: die() on the remaining error pathPablo Sabater, Aug 8, 2026
  104. 06/10 transport: drop remote object-info fields from transport structPablo Sabater, Aug 8, 2026
  105. Junio C HamanoAug 8, 2026
  106. Chandra PratapAug 8, 2026
  107. Karthik NayakAug 11, 2026
  108. 07/10 protocol-caps: add type support to object-infoPablo Sabater, Aug 8, 2026
  109. 08/10 fetch-object-info: parse type from server responsePablo Sabater, Aug 8, 2026
  110. 09/10 serve: advertise type capabilityPablo Sabater, Aug 8, 2026
  111. 10/10 cat-file: unify default formatPablo Sabater, Aug 8, 2026
  112. Jeff KingAug 8, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.