{"thread":{"id":"63618","subject":"[GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","startedAt":"2025-06-10T15:21:47Z","lastAt":"2025-08-17T16:21:27Z","messageCount":226,"participants":["Lucas Seiki Oshiro","Kristoffer Haugsbakk","Junio C Hamano","Karthik Nayak","Phillip Wood","phillip.wood123@gmail.com","Patrick Steinhardt","Justin Tobler","Oswald Buddenhagen","Jean-Noël AVILA","Eric Sunshine","Ben Knoble"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"520044","messageId":"20250610152117.14826-1-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":null,"subject":"[GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:12Z","receivedAt":"2025-06-10T15:21:47Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Hi!\n\nThis is the first RFC for my GSoC project: the new command `repo-info`.\n\n## Motivation\n\nCurrently, `git rev-parse` covers a wide range of functionality not directly\nrelated to parsing revisions, as its name says. Over time, many features like\nparsing datestrings, options, paths, and others were added to it because\nthere wasn't a more appropriated command to place them.\n\nThis way, many of these features would be better placed in new and dedicated\ncommands. This kind of movement had other precedents in Git, for example, `git\nswitch` and `git restore` were created after `git checkout` became too\noverloaded.\n\n## Proposal\n\nThis patchset introduces a new command `git repo-info`. Its goal is to bring the\nfunctionality of retrieving repository-related information currently returned by\n`rev-parse`, displaying them in machine-readable formats (like JSON or plaintext).\n\nUnder `rev-parse`, these information is retrieved by using these flags\n(described in the section \"Options for Files\" of `rev-parse`'s documentation):\n\n- `--show-object-format`: the hashing algorithm (i.e. `sha1` or `sha256`)\n\n- `--git-dir`: The Git directory of the repository\n\n- `--git-common-dir`: The common Git directory\n\n- `--show-toplevel`: the top level directory of the repository\n\n- `--show-ref-format`: the reference database format (`files` or `reftable`),\n\n- `--show-superproject-working-tree`: the absolute path of the superproject\n\n- `--is-bare-repository`: whether this is a bare repository\n\n- `--is-shallow-repository` whether this is a shallow repository\n\n## Command design\n\nThe retrieved data will be presented as in a JSON format, like this:\n\n~~~\n$ git repo-info\n{\n \"objects\": {\n \"format\": \"sha1\"\n },\n \"references\": {\n \"format\": \"files\"\n },\n \"path\": {\n \"git-dir\": \"/git/dir\"\n \"git-commom-dir\": \"/git/common-dir\",\n \"toplevel\": \"/git/toplevel\",\n \"superproject-working-tree\": \"/super/working/tree\",\n }\n \"layout\": {\n \"bare\": false,\n \"shallow\": false\n }\n}\n~~~\n\nOr in a plaintext format, like this:\n\n~~~\n$ git repo-info --format=plaintext\nsha1\nfiles\n/git/dir\n/git/common-dir\n/git/toplevel\n/super/working/tree\nfalse\nfalse\n~~~\n\nIt will also allow the user to get only the desired fields, like this:\n\n~~~\n$ git repo-info --format=plaintext objects.format references.format\nsha1\nfiles\n~~~\n\nor:\n\n~~~\n$ git repo-info objects.format references.format\n{\n \"objects\": {\n \"format\": \"sha1\"\n },\n \"references\": {\n \"format\": \"files\"\n }\n}\n~~~\n\nCurrently this RFC only implements \"objects.format\", \"layout.bare\" and\n\"layout.shallow\", but I'm making it flexible to add other fields, following\nthis format.\n\n## Feedback\n\nI would like to ask for your feedback on this proprosal, specially:\n\n- on deciding if the JSON and linewise plaintext formats are the really the best,\n or if I should consider others (e.g. gitconfig syntax, NUL-terminated, etc)\n\n- on deciding how the fields will be specified. This \".\" was\n a first idea based on the JSON structure\n\n- about the JSON schema\n\n- about information that may be nice to include in the output of this command,\n even if they are not currently retrieved by `rev-parse`\n\nThanks!\n\nLucas Seiki Oshiro (5):\n repo-info: declare the repo-info command\n repo-info: add the --format flag\n repo-info: add the field references.format\n repo-info: add field layout.bare\n repo-info: add field layout.shallow\n\n .gitignore | 1 +\n Makefile | 1 +\n builtin.h | 1 +\n builtin/repo-info.c | 233 +++++++++++++++++++++++++++++++++++++++++++\n git.c | 1 +\n meson.build | 1 +\n t/meson.build | 1 +\n t/t1518-repo-info.sh | 123 +++++++++++++++++++++++\n 8 files changed, 362 insertions(+)\n create mode 100644 builtin/repo-info.c\n create mode 100755 t/t1518-repo-info.sh\n\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520045","messageId":"20250610152117.14826-2-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH 1/5] repo-info: declare the repo-info command","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:13Z","receivedAt":"2025-06-10T15:21:49Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Create a new Git subcommand called repo-info. `git repo-info` will query\nmetadata from the current repository and outputs it as JSON or plaintext.\n\nAlso add entries for this new command in:\n\n- the build files (Makefile and meson.build)\n- builtin.h\n- git.c\n- .gitignore\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n .gitignore | 1 +\n Makefile | 1 +\n builtin.h | 1 +\n builtin/repo-info.c | 22 ++++++++++++++++++++++\n git.c | 1 +\n meson.build | 1 +\n 6 files changed, 27 insertions(+)\n create mode 100644 builtin/repo-info.c\n\ndiff --git a/.gitignore b/.gitignore\nindex 04c444404e..b2f3fb0047 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -139,6 +139,7 @@\n /git-repack\n /git-replace\n /git-replay\n+/git-repo-info\n /git-request-pull\n /git-rerere\n /git-reset\ndiff --git a/Makefile b/Makefile\nindex 70d1543b6b..50e3a3cbcc 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1308,6 +1308,7 @@ BUILTIN_OBJS += builtin/remote.o\n BUILTIN_OBJS += builtin/repack.o\n BUILTIN_OBJS += builtin/replace.o\n BUILTIN_OBJS += builtin/replay.o\n+BUILTIN_OBJS += builtin/repo-info.o\n BUILTIN_OBJS += builtin/rerere.o\n BUILTIN_OBJS += builtin/reset.o\n BUILTIN_OBJS += builtin/rev-list.o\ndiff --git a/builtin.h b/builtin.h\nindex bff13e3069..cc6bc95962 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -216,6 +216,7 @@ int cmd_remote_ext(int argc, const char **argv, const char *prefix, struct repos\n int cmd_remote_fd(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_repack(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_replay(int argc, const char **argv, const char *prefix, struct repository *repo);\n+int cmd_repo_info(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_rerere(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_reset(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_restore(int argc, const char **argv, const char *prefix, struct repository *repo);\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nnew file mode 100644\nindex 0000000000..4615b988d8\n--- /dev/null\n+++ b/builtin/repo-info.c\n@@ -0,0 +1,22 @@\n+#include \"builtin.h\"\n+#include \"parse-options.h\"\n+\n+int cmd_repo_info(\n+\tint argc,\n+\tconst char **argv,\n+\tconst char *prefix,\n+\tstruct repository *repo UNUSED\n+\t)\n+{\n+\tconst char *const repo_info_usage[] = {\n+\t\t\"git repo-info\",\n+\t\tNULL\n+\t};\n+\tstruct option options[] = {\n+\t\tOPT_END()\n+\t};\n+\n+\targc = parse_options(argc, argv, prefix, options, repo_info_usage, 0);\n+\n+\treturn 0;\n+}\ndiff --git a/git.c b/git.c\nindex 7c37872a88..d1774de82f 100644\n--- a/git.c\n+++ b/git.c\n@@ -611,6 +611,7 @@ static struct cmd_struct commands[] = {\n \t{ \"repack\", cmd_repack, RUN_SETUP },\n \t{ \"replace\", cmd_replace, RUN_SETUP },\n \t{ \"replay\", cmd_replay, RUN_SETUP },\n+\t{ \"repo-info\", cmd_repo_info, RUN_SETUP },\n \t{ \"rerere\", cmd_rerere, RUN_SETUP },\n \t{ \"reset\", cmd_reset, RUN_SETUP },\n \t{ \"restore\", cmd_restore, RUN_SETUP | NEED_WORK_TREE },\ndiff --git a/meson.build b/meson.build\nindex 7fea4a34d6..06f2f647ba 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -645,6 +645,7 @@ builtin_sources = [\n 'builtin/repack.c',\n 'builtin/replace.c',\n 'builtin/replay.c',\n+ 'builtin/repo-info.c',\n 'builtin/rerere.c',\n 'builtin/reset.c',\n 'builtin/rev-list.c',\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520046","messageId":"20250610152117.14826-3-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH 2/5] repo-info: add the --format flag","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:14Z","receivedAt":"2025-06-10T15:21:52Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the --format flag to the repo-info command, allowing the user to\nchoose betwen the 'json' and 'plaintext' formats as output.\n\nAlso add a flag --allow-empty, which will force the output data to be\nempty when no field is requested.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 79 ++++++++++++++++++++++++++++++++++++++++++--\n t/meson.build | 1 +\n t/t1518-repo-info.sh | 49 +++++++++++++++++++++++++++\n 3 files changed, 127 insertions(+), 2 deletions(-)\n create mode 100755 t/t1518-repo-info.sh\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex 4615b988d8..4d539a17fb 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -1,22 +1,97 @@\n #include \"builtin.h\"\n+#include \"hash.h\"\n+#include \"json-writer.h\"\n #include \"parse-options.h\"\n+#include \"refs.h\"\n+\n+enum output_format {\n+\tFORMAT_PLAINTEXT,\n+\tFORMAT_JSON\n+};\n+\n+struct repo_info {\n+\tstruct repository *repo;\n+\tenum output_format format;\n+};\n+\n+static void repo_info_init(struct repo_info *repo_info,\n+\t\t\t struct repository *repo,\n+\t\t\t char *format,\n+\t\t\t int allow_empty UNUSED,\n+\t\t\t int argc UNUSED,\n+\t\t\t const char **argv UNUSED\n+\t\t\t ) {\n+\trepo_info->repo = repo;\n+\n+\tif (format == NULL || !strcmp(format, \"json\"))\n+\t\trepo_info->format = FORMAT_JSON;\n+\telse if (!strcmp(format, \"plaintext\"))\n+\t\trepo_info->format = FORMAT_PLAINTEXT;\n+\telse\n+\t\tdie(\"invalid format %s\", format);\n+}\n+\n+static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED) {\n+}\n+\n+static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n+{\n+\tstruct json_writer jw;\n+\n+\tjw_init(&jw);\n+\n+\tjw_object_begin(&jw, 1);\n+\tjw_end(&jw);\n+\n+\tputs(jw.json.buf);\n+\tjw_release(&jw);\n+}\n+\n+static void repo_info_print(struct repo_info *repo_info)\n+{\n+\tenum output_format format = repo_info->format;\n+\n+\tswitch (format) {\n+\tcase FORMAT_PLAINTEXT:\n+\t\trepo_info_print_plaintext(repo_info);\n+\t\tbreak;\n+\tcase FORMAT_JSON:\n+\t\trepo_info_print_json(repo_info);\n+\t\tbreak;\n+\t}\n+}\n \n int cmd_repo_info(\n \tint argc,\n \tconst char **argv,\n \tconst char *prefix,\n-\tstruct repository *repo UNUSED\n+\tstruct repository *repo\n \t)\n {\n \tconst char *const repo_info_usage[] = {\n \t\t\"git repo-info\",\n \t\tNULL\n \t};\n+\tstruct repo_info repo_info;\n+\tchar *format = NULL;\n+\tint allow_empty = 0;\n \tstruct option options[] = {\n+\t\tOPT_STRING(0,\n+\t\t\t \"format\",\n+\t\t\t &format,\n+\t\t\t N_(\"format\"),\n+\t\t\t N_(\"output format\")),\n+\t\tOPT_BOOL(0,\n+\t\t\t \"allow-empty\",\n+\t\t\t &allow_empty,\n+\t\t\t \"when set, it will use an empty set of fields if no field is requested\"),\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, repo_info_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n+\t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n+\trepo_info_init(&repo_info, repo, format, allow_empty, argc, argv);\n+\trepo_info_print(&repo_info);\n \n \treturn 0;\n }\ndiff --git a/t/meson.build b/t/meson.build\nindex 50e89e764a..c24e197c60 100644\n--- a/t/meson.build\n+++ b/t/meson.build\n@@ -241,6 +241,7 @@ integration_tests = [\n 't1514-rev-parse-push.sh',\n 't1515-rev-parse-outside-repo.sh',\n 't1517-outside-repo.sh',\n+ 't1518-repo-info.sh',\n 't1600-index.sh',\n 't1601-index-bogus.sh',\n 't1700-split-index.sh',\ndiff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\nnew file mode 100755\nindex 0000000000..2e1a6f0c34\n--- /dev/null\n+++ b/t/t1518-repo-info.sh\n@@ -0,0 +1,49 @@\n+#!/bin/sh\n+\n+test_description='test git repo-info'\n+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n+\n+. ./test-lib.sh\n+\n+parse_json () {\n+\ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n+}\n+\n+test_repo_info () {\n+\tlabel=$1\n+\tinit_args=$2\n+\tkey=$3\n+\texpected_value=$4\n+\n+\ttest_expect_success \"json: $label\" \"\n+\t\ttest_when_finished 'rm -rf repo' &&\n+\t\tgit init $init_args repo &&\n+\t\tcd repo &&\n+\t\techo '$expected_value' >expect &&\n+\t\tgit repo-info '$key'| parse_json >output &&\n+\t\tgrep -F 'row[0].$key' output | cut -d ' ' -f 2 >actual &&\n+\t\ttest_cmp expect actual\n+\t\"\n+\n+\ttest_expect_success \"plaintext: $label\" \"\n+\t\ttest_when_finished 'rm -rf repo' &&\n+\t\tgit init $init_args repo &&\n+\t\tcd repo &&\n+\t\techo '$expected_value' >expect &&\n+\t\tgit repo-info --format=plaintext '$key' >actual &&\n+\t\ttest_cmp expect actual\n+\t\"\n+}\n+\n+test_expect_success 'json: returns empty output with allow-empty' '\n+\tgit repo-info --allow-empty --format=json >output &&\n+\ttest_line_count = 2 output\n+'\n+\n+test_expect_success 'plaintext: returns empty output with allow-empty' '\n+\tgit repo-info --allow-empty --format=plaintext >output &&\n+\ttest_line_count = 0 output\n+'\n+\n+test_done\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520047","messageId":"20250610152117.14826-4-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH 3/5] repo-info: add the field references.format","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:15Z","receivedAt":"2025-06-10T15:21:54Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the field references.format to the repo-info command. The data\nretrieved in this field is the same that currently is obtained by\nrunning `git rev-parse --show-ref-format`.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 97 +++++++++++++++++++++++++++++++++++++++++---\n t/t1518-repo-info.sh | 20 +++++++++\n 2 files changed, 112 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex 4d539a17fb..a1c9d3942e 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -9,18 +9,40 @@ enum output_format {\n \tFORMAT_JSON\n };\n \n+enum repo_info_category {\n+\tCATEGORY_REFERENCES = 1\n+};\n+\n+enum repo_info_references_field {\n+\tFIELD_REFERENCES_FORMAT = 1\n+};\n+\n+struct repo_info_field {\n+\tenum repo_info_category category;\n+\tunion {\n+\t\tenum repo_info_references_field references;\n+\t} field;\n+};\n+\n struct repo_info {\n \tstruct repository *repo;\n \tenum output_format format;\n+\tint n_fields;\n+\tstruct repo_info_field *fields;\n+};\n+\n+const char *default_fields[] = {\n+\t\"references.format\",\n };\n \n static void repo_info_init(struct repo_info *repo_info,\n \t\t\t struct repository *repo,\n \t\t\t char *format,\n-\t\t\t int allow_empty UNUSED,\n-\t\t\t int argc UNUSED,\n-\t\t\t const char **argv UNUSED\n+\t\t\t int allow_empty,\n+\t\t\t int argc,\n+\t\t\t const char **argv\n \t\t\t ) {\n+\tint i;\n \trepo_info->repo = repo;\n \n \tif (format == NULL || !strcmp(format, \"json\"))\n@@ -29,18 +51,82 @@ static void repo_info_init(struct repo_info *repo_info,\n \t\trepo_info->format = FORMAT_PLAINTEXT;\n \telse\n \t\tdie(\"invalid format %s\", format);\n+\n+\tif (argc == 0 && !allow_empty) {\n+\t\targc = ARRAY_SIZE(default_fields);\n+\t\targv = default_fields;\n+\t}\n+\n+\trepo_info->n_fields = argc;\n+\trepo_info->fields = xmalloc(argc * sizeof(struct repo_info_field));\n+\n+\tfor (i = 0; i < argc; i++) {\n+\t\tconst char *arg = argv[i];\n+\t\tstruct repo_info_field *field = repo_info->fields + i;\n+\n+\t\tif (!strcmp(arg, \"references.format\")) {\n+\t\t\tfield->category = CATEGORY_REFERENCES;\n+\t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n+\t\t}\n+\t\telse {\n+\t\t\tdie(\"invalid field '%s'\", arg);\n+\t\t}\n+\t}\n+}\n+\n+static void repo_info_release(struct repo_info *repo_info) {\n+\tfree(repo_info->fields);\n }\n \n-static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED) {\n+static void repo_info_print_plaintext(struct repo_info *repo_info) {\n+\tstruct repository *repo = repo_info->repo;\n+\tint i;\n+\tfor (i = 0; i < repo_info->n_fields; i++) {\n+\t\tstruct repo_info_field *field = &repo_info->fields[i];\n+\t\tswitch (field->category) {\n+\t\tcase CATEGORY_REFERENCES:\n+\t\t\tswitch (field->field.references) {\n+\t\t\tcase FIELD_REFERENCES_FORMAT:\n+\t\t\t\tputs(ref_storage_format_to_name(\n+\t\t\t\t\trepo->ref_storage_format));\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t}\n }\n \n-static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n+static void repo_info_print_json(struct repo_info *repo_info)\n {\n \tstruct json_writer jw;\n+\tint i;\n+\tunsigned int categories = 0;\n+\tunsigned int references_fields = 0;\n+\tstruct repository *repo = repo_info->repo;\n+\n+\tfor (i = 0; i < repo_info->n_fields; i++) {\n+\t\tstruct repo_info_field *field = repo_info->fields + i;\n+\t\tcategories |= field->category;\n+\t\tswitch (field->category) {\n+\t\tcase CATEGORY_REFERENCES:\n+\t\t\treferences_fields |= field->field.references;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n \n \tjw_init(&jw);\n \n \tjw_object_begin(&jw, 1);\n+\n+\tif (categories & CATEGORY_REFERENCES) {\n+\t\tjw_object_inline_begin_object(&jw, \"references\");\n+\t\tif (references_fields & FIELD_REFERENCES_FORMAT) {\n+\t\t\tconst char *format_name = ref_storage_format_to_name(\n+\t\t\t\trepo->ref_storage_format);\n+\t\t\tjw_object_string(&jw, \"format\", format_name);\n+\t\t}\n+\t\tjw_end(&jw);\n+\t}\n \tjw_end(&jw);\n \n \tputs(jw.json.buf);\n@@ -92,6 +178,7 @@ int cmd_repo_info(\n \t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n \trepo_info_init(&repo_info, repo, format, allow_empty, argc, argv);\n \trepo_info_print(&repo_info);\n+\trepo_info_release(&repo_info);\n \n \treturn 0;\n }\ndiff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\nindex 2e1a6f0c34..a99198b0f6 100755\n--- a/t/t1518-repo-info.sh\n+++ b/t/t1518-repo-info.sh\n@@ -6,6 +6,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n+DEFAULT_NUMBER_OF_FIELDS=1\n+\n parse_json () {\n \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n }\n@@ -46,4 +48,22 @@ test_expect_success 'plaintext: returns empty output with allow-empty' '\n \ttest_line_count = 0 output\n '\n \n+test_repo_info 'ref format files is retrieved correctly' \\\n+\t'' \\\n+\t'references.format' 'files'\n+\n+test_repo_info 'ref format reftable is retrieved correctly' \\\n+\t'--ref-format=reftable' \\\n+\t'references.format' 'reftable'\n+\n+test_expect_success 'plaintext: output all default fields' \"\n+\tgit repo-info --format=plaintext >actual &&\n+\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n+\"\n+\n+test_expect_success 'json: output all default fields' \"\n+\tgit repo-info --format=json | parse_json | grep '.*\\..*\\..*' >actual &&\n+\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n+\"\n+\n test_done\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520048","messageId":"20250610152117.14826-6-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH 5/5] repo-info: add field layout.shallow","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:17Z","receivedAt":"2025-06-10T15:21:58Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the field layout.shallow to the repo-info command. The data\nretrieved in this field is the same that currently is obtained by\nrunning `git rev-parse --is-shallow-repository`.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 20 ++++++++++++++++--\n t/t1518-repo-info.sh | 48 +++++++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 65 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex bc25a0809f..d821292d78 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -6,6 +6,7 @@\n #include \"json-writer.h\"\n #include \"parse-options.h\"\n #include \"refs.h\"\n+#include \"shallow.h\"\n \n enum output_format {\n \tFORMAT_PLAINTEXT,\n@@ -21,7 +22,9 @@ enum repo_info_references_field {\n \tFIELD_REFERENCES_FORMAT = 1\n };\n \n-enum repo_info_layout_field { FIELD_LAYOUT_BARE = 1\n+enum repo_info_layout_field {\n+\tFIELD_LAYOUT_BARE = 1,\n+\tFIELD_LAYOUT_SHALLOW = 1 << 1\n };\n \n struct repo_info_field {\n@@ -41,7 +44,8 @@ struct repo_info {\n \n const char *default_fields[] = {\n \t\"references.format\",\n-\t\"layout.bare\"\n+\t\"layout.bare\",\n+\t\"layout.shallow\"\n };\n \n static void repo_info_init(struct repo_info *repo_info,\n@@ -81,6 +85,10 @@ static void repo_info_init(struct repo_info *repo_info,\n \t\t\tfield->category = CATEGORY_LAYOUT;\n \t\t\tfield->field.layout = FIELD_LAYOUT_BARE;\n \t\t}\n+\t\telse if (!strcmp(arg, \"layout.shallow\")) {\n+\t\t\tfield->category = CATEGORY_LAYOUT;\n+\t\t\tfield->field.layout = FIELD_LAYOUT_SHALLOW;\n+\t\t}\n \t\telse {\n \t\t\tdie(\"invalid field '%s'\", arg);\n \t\t}\n@@ -110,6 +118,9 @@ static void repo_info_print_plaintext(struct repo_info *repo_info) {\n \t\t\tcase FIELD_LAYOUT_BARE:\n \t\t\t\tputs(is_bare_repository() ? \"true\" : \"false\");\n \t\t\t\tbreak;\n+\t\t\tcase FIELD_LAYOUT_SHALLOW:\n+\t\t\t\tputs(is_repository_shallow(repo) ? \"true\" : \"false\");\n+\t\t\t\tbreak;\n \t\t\t}\n \t\t\tbreak;\n \t\t}\n@@ -158,6 +169,11 @@ static void repo_info_print_json(struct repo_info *repo_info)\n \t\t\tjw_object_bool(&jw, \"bare\",\n \t\t\t\t is_bare_repository());\n \t\t}\n+\n+\t\tif (layout_fields & FIELD_LAYOUT_SHALLOW) {\n+\t\t\tjw_object_bool(&jw, \"shallow\",\n+\t\t\t\t is_repository_shallow(repo));\n+\t\t}\n \t\tjw_end(&jw);\n \t}\n \tjw_end(&jw);\ndiff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\nindex 1831b74551..10de93219b 100755\n--- a/t/t1518-repo-info.sh\n+++ b/t/t1518-repo-info.sh\n@@ -6,7 +6,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n-DEFAULT_NUMBER_OF_FIELDS=2\n+DEFAULT_NUMBER_OF_FIELDS=3\n \n parse_json () {\n \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n@@ -64,6 +64,51 @@ test_repo_info 'bare repository = true is retrieved correctly' \\\n \t'--bare' \\\n \t'layout.bare' 'true'\n \n+test_repo_info 'shallow repository = false is retrieved correctly' \\\n+\t'' \\\n+\t'layout.shallow' 'false'\n+\n+test_expect_success 'json: shallow repository = true is retrieved correctly' '\n+\ttest_when_finished \"rm -rf repo\" &&\n+\tgit init repo &&\n+\tcd repo &&\n+\techo x >x &&\n+\tgit add x &&\n+\tgit commit -m x &&\n+\tgit clone --depth 1 \"file://$PWD\" cloned &&\n+\tcd cloned &&\n+\techo 1 >expect &&\n+\tgit repo-info \"layout.shallow\" | parse_json >output &&\n+\tgrep -F \"row[0].layout.shallow\" output | cut -d \" \" -f 2 >actual &&\n+\tcat actual > /dev/ttys001 &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'plaintext: shallow repository = true is retrieved correctly' '\n+\ttest_when_finished \"rm -rf repo\" &&\n+\tgit init repo &&\n+\tcd repo &&\n+\techo x >x &&\n+\tgit add x &&\n+\tgit commit -m x &&\n+\ttest_commit \"commit\" &&\n+\tgit clone --depth=1 \"file://$PWD\" cloned &&\n+\tcd cloned &&\n+ \techo true >expect &&\n+ \tgit repo-info --format=plaintext \"layout.shallow\" >actual &&\n+ \ttest_cmp expect actual\n+'\n+\n+test_expect_success 'plaintext: output all default fields' \"\n+\tgit repo-info --format=plaintext >actual &&\n+\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n+\"\n+\n+test_expect_success 'json: output all default fields' \"\n+\tgit repo-info --format=json | parse_json | grep '.*\\..*\\..*' >actual &&\n+\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n+\"\n+\n test_expect_success 'plaintext: output all default fields' \"\n \tgit repo-info --format=plaintext >actual &&\n \ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n@@ -74,4 +119,5 @@ test_expect_success 'json: output all default fields' \"\n \ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n \"\n \n+\n test_done\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520049","messageId":"20250610152117.14826-5-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH 4/5] repo-info: add field layout.bare","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-10T15:21:16Z","receivedAt":"2025-06-10T15:22:07Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the field layout.bare to the repo-info command. The data\nretrieved in this field is the same that currently is obtained by\nrunning `git rev-parse --is-bare-repository`.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 35 ++++++++++++++++++++++++++++++++++-\n t/t1518-repo-info.sh | 12 ++++++++++--\n 2 files changed, 44 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex a1c9d3942e..bc25a0809f 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -1,4 +1,7 @@\n+#define USE_THE_REPOSITORY_VARIABLE\n+\n #include \"builtin.h\"\n+#include \"environment.h\"\n #include \"hash.h\"\n #include \"json-writer.h\"\n #include \"parse-options.h\"\n@@ -10,17 +13,22 @@ enum output_format {\n };\n \n enum repo_info_category {\n-\tCATEGORY_REFERENCES = 1\n+\tCATEGORY_REFERENCES = 1,\n+\tCATEGORY_LAYOUT = 1 << 1\n };\n \n enum repo_info_references_field {\n \tFIELD_REFERENCES_FORMAT = 1\n };\n \n+enum repo_info_layout_field { FIELD_LAYOUT_BARE = 1\n+};\n+\n struct repo_info_field {\n \tenum repo_info_category category;\n \tunion {\n \t\tenum repo_info_references_field references;\n+\t\tenum repo_info_layout_field layout;\n \t} field;\n };\n \n@@ -33,6 +41,7 @@ struct repo_info {\n \n const char *default_fields[] = {\n \t\"references.format\",\n+\t\"layout.bare\"\n };\n \n static void repo_info_init(struct repo_info *repo_info,\n@@ -68,6 +77,10 @@ static void repo_info_init(struct repo_info *repo_info,\n \t\t\tfield->category = CATEGORY_REFERENCES;\n \t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n \t\t}\n+\t\telse if (!strcmp(arg, \"layout.bare\")) {\n+\t\t\tfield->category = CATEGORY_LAYOUT;\n+\t\t\tfield->field.layout = FIELD_LAYOUT_BARE;\n+\t\t}\n \t\telse {\n \t\t\tdie(\"invalid field '%s'\", arg);\n \t\t}\n@@ -92,6 +105,13 @@ static void repo_info_print_plaintext(struct repo_info *repo_info) {\n \t\t\t\tbreak;\n \t\t\t}\n \t\t\tbreak;\n+\t\tcase CATEGORY_LAYOUT:\n+\t\t\tswitch (field->field.layout) {\n+\t\t\tcase FIELD_LAYOUT_BARE:\n+\t\t\t\tputs(is_bare_repository() ? \"true\" : \"false\");\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tbreak;\n \t\t}\n \t}\n }\n@@ -102,6 +122,7 @@ static void repo_info_print_json(struct repo_info *repo_info)\n \tint i;\n \tunsigned int categories = 0;\n \tunsigned int references_fields = 0;\n+\tunsigned int layout_fields = 0;\n \tstruct repository *repo = repo_info->repo;\n \n \tfor (i = 0; i < repo_info->n_fields; i++) {\n@@ -111,6 +132,9 @@ static void repo_info_print_json(struct repo_info *repo_info)\n \t\tcase CATEGORY_REFERENCES:\n \t\t\treferences_fields |= field->field.references;\n \t\t\tbreak;\n+\t\tcase CATEGORY_LAYOUT:\n+\t\t\tlayout_fields |= field->field.layout;\n+\t\t\tbreak;\n \t\t}\n \t}\n \n@@ -127,6 +151,15 @@ static void repo_info_print_json(struct repo_info *repo_info)\n \t\t}\n \t\tjw_end(&jw);\n \t}\n+\n+\tif (categories & CATEGORY_LAYOUT) {\n+\t\tjw_object_inline_begin_object(&jw, \"layout\");\n+\t\tif (layout_fields & FIELD_LAYOUT_BARE) {\n+\t\t\tjw_object_bool(&jw, \"bare\",\n+\t\t\t\t is_bare_repository());\n+\t\t}\n+\t\tjw_end(&jw);\n+\t}\n \tjw_end(&jw);\n \n \tputs(jw.json.buf);\ndiff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\nindex a99198b0f6..1831b74551 100755\n--- a/t/t1518-repo-info.sh\n+++ b/t/t1518-repo-info.sh\n@@ -6,7 +6,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n-DEFAULT_NUMBER_OF_FIELDS=1\n+DEFAULT_NUMBER_OF_FIELDS=2\n \n parse_json () {\n \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n@@ -22,7 +22,7 @@ test_repo_info () {\n \t\ttest_when_finished 'rm -rf repo' &&\n \t\tgit init $init_args repo &&\n \t\tcd repo &&\n-\t\techo '$expected_value' >expect &&\n+\t\techo '$expected_value' | sed 's/^false$/0/' | sed 's/^true$/1/' >expect &&\n \t\tgit repo-info '$key'| parse_json >output &&\n \t\tgrep -F 'row[0].$key' output | cut -d ' ' -f 2 >actual &&\n \t\ttest_cmp expect actual\n@@ -56,6 +56,14 @@ test_repo_info 'ref format reftable is retrieved correctly' \\\n \t'--ref-format=reftable' \\\n \t'references.format' 'reftable'\n \n+test_repo_info 'bare repository = false is retrieved correctly' \\\n+\t'' \\\n+\t'layout.bare' 'false'\n+\n+test_repo_info 'bare repository = true is retrieved correctly' \\\n+\t'--bare' \\\n+\t'layout.bare' 'true'\n+\n test_expect_success 'plaintext: output all default fields' \"\n \tgit repo-info --format=plaintext >actual &&\n \ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520051","messageId":"0e4a7c78-8e64-4c27-8ae2-c2c664dba0a9@app.fastmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-06-10T16:39:09Z","receivedAt":"2025-06-10T16:39:32Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Tue, Jun 10, 2025, at 17:21, Lucas Seiki Oshiro wrote:\n> ## Motivation\n>\n> Currently, `git rev-parse` covers a wide range of functionality not directly\n> related to parsing revisions, as its name says. Over time, many features like\n> parsing datestrings, options, paths, and others were added to it because\n> there wasn't a more appropriated command to place them.\n>\n> This way, many of these features would be better placed in new and dedicated\n> commands. This kind of movement had other precedents in Git, for example, `git\n> switch` and `git restore` were created after `git checkout` became too\n> overloaded.\n\nThis is something I’ve wanted. Thanks for starting the work.\n\n-- \nKristoffer Haugsbakk\n"},{"id":"520052","messageId":"xmqqikl3mtx2.fsf@gitster.g","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-06-10T16:40:41Z","receivedAt":"2025-06-10T16:40:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> $ git repo-info\n> {\n> \"objects\": {\n> \"format\": \"sha1\"\n> },\n> \"references\": {\n> \"format\": \"files\"\n> },\n> \"path\": {\n> \"git-dir\": \"/git/dir\"\n> \"git-commom-dir\": \"/git/common-dir\",\n> \"toplevel\": \"/git/toplevel\",\n> \"superproject-working-tree\": \"/super/working/tree\",\n> }\n> \"layout\": {\n> \"bare\": false,\n> \"shallow\": false\n> }\n> }\n> ~~~\n\nOK, that's understandable, other than that handling of trailing\ncommas looks somewhat inconsistent.\n\n> Or in a plaintext format, like this:\n>\n> ~~~\n> $ git repo-info --format=plaintext\n> sha1\n> files\n> /git/dir\n> /git/common-dir\n> /git/toplevel\n> /super/working/tree\n> false\n> false\n> ~~~\n\nThis one is a bit questionable.\n\nIs it safe to assume that we will never have to deal with payload\ncontrollable by the end-user that can have arbitrary byte values?\nIt would be uncommon but possible for LF to be in one of these\npathnames, breaking one-line-per-item assumption you seem to be\nmaking. If one-line-per-item can be assumed, you can certainly\nclaim that this format is easy for consumers to handle, but the fact\nis that this format is cumbersome to use safely if we have to deal\nwith end-user controllable arbitrary byte sequences, and if the set\nof info pieces the repo-info needs to deal with changes over time.\n\n> It will also allow the user to get only the desired fields, like this:\n>\n> ~~~\n> $ git repo-info --format=plaintext objects.format references.format\n> sha1\n> files\n> ~~~\n\nIf the user asked for only one item, this is probably OK, but for\nmore than one items, the same comment applies as above (except that\nthe number of and order of info pieces are known in this case).\n\n> or:\n>\n> ~~~\n> $ git repo-info objects.format references.format\n> {\n> \"objects\": {\n> \"format\": \"sha1\"\n> },\n> \"references\": {\n> \"format\": \"files\"\n> }\n> }\n> ~~~\n\nThis one is OK.\n\n> - on deciding if the JSON and linewise plaintext formats are the really the best,\n> or if I should consider others (e.g. gitconfig syntax, NUL-terminated, etc)\n\n\"git config list\" and \"git config get\" may be weaker in handling\narbitrary bytes than we would wish them to be. As much as I loath\nJSON, the format is widely recognised and supported, so as the\ninitial cut, it may be sufficient to nail down the schema first and\nthen worry about emitting the same information in other formats\nlater.\n\n\n"},{"id":"520079","messageId":"CAOLa=ZS_JC_3DYUmYu65V7J__yr6Wv=j0Om6JJ47HxMkZSSyJA@mail.gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-2-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 1/5] repo-info: declare the repo-info command","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-11T08:59:02Z","receivedAt":"2025-06-11T08:59:04Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> Create a new Git subcommand called repo-info. `git repo-info` will query\n> metadata from the current repository and outputs it as JSON or plaintext.\n>\n> Also add entries for this new command in:\n>\n> - the build files (Makefile and meson.build)\n> - builtin.h\n> - git.c\n> - .gitignore\n>\n\nWe should also add documentation for this new command in\n'Documentation/git-repo-info.adoc'.\n\n[snip]\n"},{"id":"520081","messageId":"CAOLa=ZRFM5ZVyBfbpYjePN1c+cVBTfU-nk+hsQOGt5e1CJ3EXA@mail.gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-3-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 2/5] repo-info: add the --format flag","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-11T09:30:17Z","receivedAt":"2025-06-11T09:30:20Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> Add the --format flag to the repo-info command, allowing the user to\n> choose betwen the 'json' and 'plaintext' formats as output.\n>\n\ns/betwen/between\n\n> Also add a flag --allow-empty, which will force the output data to be\n> empty when no field is requested.\n>\n\nWhy do you suppose we need this, I'm not against it, but it would be\nnice to state why this is necessary. The idea is to have a default\noutput when a user runs `git repo-info`, so I'm missing why this would\nbe useful.\n\n> Mentored-by: Karthik Nayak \n> Mentored-by Patrick Steinhardt \n> Signed-off-by: Lucas Seiki Oshiro \n> ---\n> builtin/repo-info.c | 79 ++++++++++++++++++++++++++++++++++++++++++--\n> t/meson.build | 1 +\n> t/t1518-repo-info.sh | 49 +++++++++++++++++++++++++++\n> 3 files changed, 127 insertions(+), 2 deletions(-)\n> create mode 100755 t/t1518-repo-info.sh\n>\n> diff --git a/builtin/repo-info.c b/builtin/repo-info.c\n> index 4615b988d8..4d539a17fb 100644\n> --- a/builtin/repo-info.c\n> +++ b/builtin/repo-info.c\n> @@ -1,22 +1,97 @@\n> #include \"builtin.h\"\n> +#include \"hash.h\"\n\nThis header doesn't seem to be required for compiling this patch.\n\n> +#include \"json-writer.h\"\n> #include \"parse-options.h\"\n> +#include \"refs.h\"\n\nSimilar, this header too doesn't seem to be required.\n\n> +\n> +enum output_format {\n> +\tFORMAT_PLAINTEXT,\n> +\tFORMAT_JSON\n> +};\n> +\n> +struct repo_info {\n> +\tstruct repository *repo;\n> +\tenum output_format format;\n> +};\n> +\n> +static void repo_info_init(struct repo_info *repo_info,\n> +\t\t\t struct repository *repo,\n> +\t\t\t char *format,\n> +\t\t\t int allow_empty UNUSED,\n\nSo allow_empty isn't even used in this patch, let's separate it out to a\npatch of itself then.\n\n> +\t\t\t int argc UNUSED,\n> +\t\t\t const char **argv UNUSED\n> +\t\t\t ) {\n> +\trepo_info->repo = repo;\n> +\n> +\tif (format == NULL || !strcmp(format, \"json\"))\n> +\t\trepo_info->format = FORMAT_JSON;\n> +\telse if (!strcmp(format, \"plaintext\"))\n> +\t\trepo_info->format = FORMAT_PLAINTEXT;\n> +\telse\n> +\t\tdie(\"invalid format %s\", format);\n> +}\n> +\n> +static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED) {\n> +}\n\nSince we don't implement this in this patch, perhaps we can only\nintroduce the json formatting in this patch? That also allows us to\ncompletely skip the 'plaintext' formatting for now and implement it in\nthe future.\n\n> +static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n> +{\n> +\tstruct json_writer jw;\n> +\n> +\tjw_init(&jw);\n> +\n> +\tjw_object_begin(&jw, 1);\n> +\tjw_end(&jw);\n> +\n> +\tputs(jw.json.buf);\n> +\tjw_release(&jw);\n> +}\n> +\n> +static void repo_info_print(struct repo_info *repo_info)\n> +{\n> +\tenum output_format format = repo_info->format;\n> +\n> +\tswitch (format) {\n> +\tcase FORMAT_PLAINTEXT:\n> +\t\trepo_info_print_plaintext(repo_info);\n> +\t\tbreak;\n> +\tcase FORMAT_JSON:\n> +\t\trepo_info_print_json(repo_info);\n> +\t\tbreak;\n> +\t}\n> +}\n>\n> int cmd_repo_info(\n> \tint argc,\n> \tconst char **argv,\n> \tconst char *prefix,\n> -\tstruct repository *repo UNUSED\n> +\tstruct repository *repo\n> \t)\n> {\n> \tconst char *const repo_info_usage[] = {\n> \t\t\"git repo-info\",\n> \t\tNULL\n> \t};\n> +\tstruct repo_info repo_info;\n> +\tchar *format = NULL;\n> +\tint allow_empty = 0;\n> \tstruct option options[] = {\n> +\t\tOPT_STRING(0,\n> +\t\t\t \"format\",\n> +\t\t\t &format,\n> +\t\t\t N_(\"format\"),\n> +\t\t\t N_(\"output format\")),\n> +\t\tOPT_BOOL(0,\n> +\t\t\t \"allow-empty\",\n> +\t\t\t &allow_empty,\n> +\t\t\t \"when set, it will use an empty set of fields if no field is requested\"),\n> \t\tOPT_END()\n> \t};\n>\n> -\targc = parse_options(argc, argv, prefix, options, repo_info_usage, 0);\n> +\targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n> +\t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n\nI think I understand why we use 'PARSE_OPT_KEEP_UNKNOWN_OPT', this is to\nallow users to provide custom fields to print. But this doesn't seem to\nbe mentioned in the commit message or used in this patch, could we do\neither?\n\n[snip]\n\n> diff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\n> new file mode 100755\n> index 0000000000..2e1a6f0c34\n> --- /dev/null\n> +++ b/t/t1518-repo-info.sh\n> @@ -0,0 +1,49 @@\n> +#!/bin/sh\n> +\n> +test_description='test git repo-info'\n> +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> +\n> +. ./test-lib.sh\n> +\n> +parse_json () {\n> +\ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n> +}\n> +\n\nIf I recall correctly, in our previous internal review, it was mentioned\nthat since we use perl here, we should add a PERL pre-requisite. Similar\nto the one in 't/t0019-json-writer.sh'.\n\n> +test_repo_info () {\n\nNit: would be nice to have some documentation on this function,\nregarding:\n1. Its purpose and use case\n2. The fields and what they mean\n\nYou can take some hints from 'test_migration' in\n't/t1460-refs-migrate.sh'.\n\n> +\tlabel=$1\n> +\tinit_args=$2\n> +\tkey=$3\n> +\texpected_value=$4\n> +\n> +\ttest_expect_success \"json: $label\" \"\n> +\t\ttest_when_finished 'rm -rf repo' &&\n> +\t\tgit init $init_args repo &&\n> +\t\tcd repo &&\n> +\t\techo '$expected_value' >expect &&\n> +\t\tgit repo-info '$key'| parse_json >output &&\n> +\t\tgrep -F 'row[0].$key' output | cut -d ' ' -f 2 >actual &&\n> +\t\ttest_cmp expect actual\n> +\t\"\n> +\n> +\ttest_expect_success \"plaintext: $label\" \"\n> +\t\ttest_when_finished 'rm -rf repo' &&\n> +\t\tgit init $init_args repo &&\n> +\t\tcd repo &&\n> +\t\techo '$expected_value' >expect &&\n> +\t\tgit repo-info --format=plaintext '$key' >actual &&\n> +\t\ttest_cmp expect actual\n> +\t\"\n> +}\n> +\n> +test_expect_success 'json: returns empty output with allow-empty' '\n> +\tgit repo-info --allow-empty --format=json >output &&\n> +\ttest_line_count = 2 output\n> +'\n> +\n\nAs of this patch,\n\n $ ~/code/git/build/bin-wrappers/git repo-info\n {\n }\n\n $ ~/code/git/build/bin-wrappers/git repo-info --allow-empty\n {\n }\n\nSo what differentiates the former from the latter?\n\n> +test_expect_success 'plaintext: returns empty output with allow-empty' '\n> +\tgit repo-info --allow-empty --format=plaintext >output &&\n> +\ttest_line_count = 0 output\n> +'\n>\n\nThis is because we didn't implement plainttext no?\n\n> +\n> +test_done\n> --\n> 2.39.5 (Apple Git-154)\n\nOverall, I think the changes here make sense to me. But the commit\ncan be broken up and divided into individual bits:\n1. Commit to introduce the --format=json flag\n2. Commit to introduce the --format=plaintext flag (can be done later as\n needed)\n3. Commit to add '--allow-empty' flag (is this needed?).\n\nThis way the tests and code can also be split as per these commits, this\nwould make reviews much easier since the current patch has some dead\ncode which presumably will be used in upcoming patches.\n\n- Karthik\n"},{"id":"520086","messageId":"CAOLa=ZTNpSKoFcfQHDOQNhq-jdFJvGEsXm-rYKrHCZG8CfaqaQ@mail.gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-4-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 3/5] repo-info: add the field references.format","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-11T12:59:32Z","receivedAt":"2025-06-11T12:59:34Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> Add the field references.format to the repo-info command. The data\n> retrieved in this field is the same that currently is obtained by\n> running `git rev-parse --show-ref-format`.\n>\n> Mentored-by: Karthik Nayak \n> Mentored-by Patrick Steinhardt \n> Signed-off-by: Lucas Seiki Oshiro \n> ---\n> builtin/repo-info.c | 97 +++++++++++++++++++++++++++++++++++++++++---\n> t/t1518-repo-info.sh | 20 +++++++++\n> 2 files changed, 112 insertions(+), 5 deletions(-)\n>\n> diff --git a/builtin/repo-info.c b/builtin/repo-info.c\n> index 4d539a17fb..a1c9d3942e 100644\n> --- a/builtin/repo-info.c\n> +++ b/builtin/repo-info.c\n> @@ -9,18 +9,40 @@ enum output_format {\n> \tFORMAT_JSON\n> };\n>\n> +enum repo_info_category {\n> +\tCATEGORY_REFERENCES = 1\n> +};\n> +\n> +enum repo_info_references_field {\n> +\tFIELD_REFERENCES_FORMAT = 1\n> +};\n> +\n> +struct repo_info_field {\n> +\tenum repo_info_category category;\n> +\tunion {\n> +\t\tenum repo_info_references_field references;\n> +\t} field;\n> +};\n> +\n> struct repo_info {\n> \tstruct repository *repo;\n> \tenum output_format format;\n> +\tint n_fields;\n> +\tstruct repo_info_field *fields;\n> +};\n> +\n> +const char *default_fields[] = {\n> +\t\"references.format\",\n> };\n>\n> static void repo_info_init(struct repo_info *repo_info,\n> \t\t\t struct repository *repo,\n> \t\t\t char *format,\n> -\t\t\t int allow_empty UNUSED,\n> -\t\t\t int argc UNUSED,\n> -\t\t\t const char **argv UNUSED\n> +\t\t\t int allow_empty,\n> +\t\t\t int argc,\n> +\t\t\t const char **argv\n> \t\t\t ) {\n>\n\nNit: we wrap to 80 chars generally, so you can put multiple arguments on\nthe same line.\n\n> +\tint i;\n> \trepo_info->repo = repo;\n>\n> \tif (format == NULL || !strcmp(format, \"json\"))\n> @@ -29,18 +51,82 @@ static void repo_info_init(struct repo_info *repo_info,\n> \t\trepo_info->format = FORMAT_PLAINTEXT;\n> \telse\n> \t\tdie(\"invalid format %s\", format);\n> +\n> +\tif (argc == 0 && !allow_empty) {\n> +\t\targc = ARRAY_SIZE(default_fields);\n> +\t\targv = default_fields;\n> +\t}\n> +\n> +\trepo_info->n_fields = argc;\n> +\trepo_info->fields = xmalloc(argc * sizeof(struct repo_info_field));\n> +\n\nNit: perhaps use ALLOC_ARRAY or family here?\n\n> +\tfor (i = 0; i < argc; i++) {\n> +\t\tconst char *arg = argv[i];\n> +\t\tstruct repo_info_field *field = repo_info->fields + i;\n> +\n> +\t\tif (!strcmp(arg, \"references.format\")) {\n> +\t\t\tfield->category = CATEGORY_REFERENCES;\n> +\t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n> +\t\t}\n\nMakes me wonder if the default fields can be defined as an array of\n'repo_info_field' and avoid the strcmp since the information is\npre-defined. Perhaps something like:\n\n diff --git a/builtin/repo-info.c b/builtin/repo-info.c\n index a1c9d3942e..81c7b5f896 100644\n --- a/builtin/repo-info.c\n +++ b/builtin/repo-info.c\n @@ -31,8 +31,13 @@ struct repo_info {\n \tstruct repo_info_field *fields;\n };\n\n -const char *default_fields[] = {\n -\t\"references.format\",\n +const struct repo_info_field default_fields[] = {\n +\t{\n +\t\t.category = CATEGORY_REFERENCES,\n +\t\t.field = {\n +\t\t\t.references = FIELD_REFERENCES_FORMAT\n +\t\t},\n +\t},\n };\n\n static void repo_info_init(struct repo_info *repo_info,\n @@ -53,8 +58,8 @@ static void repo_info_init(struct repo_info *repo_info,\n \t\tdie(\"invalid format %s\", format);\n\n \tif (argc == 0 && !allow_empty) {\n -\t\targc = ARRAY_SIZE(default_fields);\n -\t\targv = default_fields;\n +\t\trepo_info->fields = (struct repo_info_field *)&default_fields;\n +\t\treturn;\n \t}\n\n \trepo_info->n_fields = argc;\n\n\n> +\t\telse {\n> +\t\t\tdie(\"invalid field '%s'\", arg);\n> +\t\t}\n> +\t}\n> +}\n> +\n> +static void repo_info_release(struct repo_info *repo_info) {\n> +\tfree(repo_info->fields);\n> }\n>\n> -static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED) {\n> +static void repo_info_print_plaintext(struct repo_info *repo_info) {\n\nThis should definitely go into its own commit or at least be mentioned in\nthe commit message.\n\n> +\tstruct repository *repo = repo_info->repo;\n> +\tint i;\n\nNit: always nice to leave a newline between the variable declarations\nand following code. Also we can move move `int i` declaration directly\ninside the loop.\n\n> +\tfor (i = 0; i < repo_info->n_fields; i++) {\n> +\t\tstruct repo_info_field *field = &repo_info->fields[i];\n> +\t\tswitch (field->category) {\n> +\t\tcase CATEGORY_REFERENCES:\n> +\t\t\tswitch (field->field.references) {\n> +\t\t\tcase FIELD_REFERENCES_FORMAT:\n> +\t\t\t\tputs(ref_storage_format_to_name(\n> +\t\t\t\t\trepo->ref_storage_format));\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> }\n>\n> -static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n> +static void repo_info_print_json(struct repo_info *repo_info)\n> {\n> \tstruct json_writer jw;\n> +\tint i;\n> +\tunsigned int categories = 0;\n> +\tunsigned int references_fields = 0;\n> +\tstruct repository *repo = repo_info->repo;\n> +\n> +\tfor (i = 0; i < repo_info->n_fields; i++) {\n> +\t\tstruct repo_info_field *field = repo_info->fields + i;\n> +\t\tcategories |= field->category;\n> +\t\tswitch (field->category) {\n> +\t\tcase CATEGORY_REFERENCES:\n> +\t\t\treferences_fields |= field->field.references;\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n>\n> \tjw_init(&jw);\n>\n> \tjw_object_begin(&jw, 1);\n> +\n> +\tif (categories & CATEGORY_REFERENCES) {\n> +\t\tjw_object_inline_begin_object(&jw, \"references\");\n> +\t\tif (references_fields & FIELD_REFERENCES_FORMAT) {\n> +\t\t\tconst char *format_name = ref_storage_format_to_name(\n> +\t\t\t\trepo->ref_storage_format);\n> +\t\t\tjw_object_string(&jw, \"format\", format_name);\n> +\t\t}\n> +\t\tjw_end(&jw);\n> +\t}\n> \tjw_end(&jw);\n>\n\nDoesn't this mean that each value of CATEGORY_REFERENCES and\nFIELD_REFERENCES_FORMAT should have no common bits? Especially in the\nformer across different categories too.\n\nI wonder if we can solve this in a easier way. We care about:\n- Retaining the order of fields input by the user\n- Having a default set of fields if no input received\n\nBut, for JSON formatting, order of fields doesn't matter as per the spec\n[1]:\n\n An object is an unordered set of name/value pairs. An object begins\n with {left brace and ends with }right brace. Each name is followed by\n :colon and the name/value pairs are separated by ,comma.\n\nSo, do we really want to keep the order? Especially since one suggestion\nis to only work with the JSON format for now.\n\nIf we don't care about the order, we can simply have a structure with\nbit fields and work with that.\n\n> \tputs(jw.json.buf);\n> @@ -92,6 +178,7 @@ int cmd_repo_info(\n> \t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n> \trepo_info_init(&repo_info, repo, format, allow_empty, argc, argv);\n> \trepo_info_print(&repo_info);\n> +\trepo_info_release(&repo_info);\n>\n> \treturn 0;\n> }\n> diff --git a/t/t1518-repo-info.sh b/t/t1518-repo-info.sh\n> index 2e1a6f0c34..a99198b0f6 100755\n> --- a/t/t1518-repo-info.sh\n> +++ b/t/t1518-repo-info.sh\n> @@ -6,6 +6,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n>\n> . ./test-lib.sh\n>\n> +DEFAULT_NUMBER_OF_FIELDS=1\n> +\n> parse_json () {\n> \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n> }\n> @@ -46,4 +48,22 @@ test_expect_success 'plaintext: returns empty output with allow-empty' '\n> \ttest_line_count = 0 output\n> '\n>\n> +test_repo_info 'ref format files is retrieved correctly' \\\n> +\t'' \\\n> +\t'references.format' 'files'\n> +\n\nThis expects that the repository is created with the 'files' backend by\ndefault, but that is defined by the 'GIT_TEST_DEFAULT_REF_FORMAT' env\nvariable. So wouldn't this fail when in the CI job for reftables?\n\n> +test_repo_info 'ref format reftable is retrieved correctly' \\\n> +\t'--ref-format=reftable' \\\n> +\t'references.format' 'reftable'\n> +\n> +test_expect_success 'plaintext: output all default fields' \"\n> +\tgit repo-info --format=plaintext >actual &&\n> +\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n> +\"\n> +\n> +test_expect_success 'json: output all default fields' \"\n> +\tgit repo-info --format=json | parse_json | grep '.*\\..*\\..*' >actual &&\n> +\ttest_line_count = $DEFAULT_NUMBER_OF_FIELDS actual\n> +\"\n> +\n\nWhile line count is good, we should also check the default values, no?\n\n> test_done\n> --\n> 2.39.5 (Apple Git-154)\n"},{"id":"520088","messageId":"CAOLa=ZTvC7Hq5Fz6N1ESzf1s=7kkyZG5iYTA6pzxnKm2p4oMNw@mail.gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-5-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 4/5] repo-info: add field layout.bare","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-11T13:13:34Z","receivedAt":"2025-06-11T13:13:38Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> Add the field layout.bare to the repo-info command. The data\n> retrieved in this field is the same that currently is obtained by\n> running `git rev-parse --is-bare-repository`.\n>\n> Mentored-by: Karthik Nayak \n> Mentored-by Patrick Steinhardt \n> Signed-off-by: Lucas Seiki Oshiro \n> ---\n> builtin/repo-info.c | 35 ++++++++++++++++++++++++++++++++++-\n> t/t1518-repo-info.sh | 12 ++++++++++--\n> 2 files changed, 44 insertions(+), 3 deletions(-)\n>\n> diff --git a/builtin/repo-info.c b/builtin/repo-info.c\n> index a1c9d3942e..bc25a0809f 100644\n> --- a/builtin/repo-info.c\n> +++ b/builtin/repo-info.c\n> @@ -1,4 +1,7 @@\n> +#define USE_THE_REPOSITORY_VARIABLE\n> +\n\nAh! Seems like `is_bare_repository()` is responsible for this, it would\nbe nice to not introduce global dependency in a new command, but this\nisn't part of your project, so it's okay here.\n\n> #include \"builtin.h\"\n> +#include \"environment.h\"\n> #include \"hash.h\"\n> #include \"json-writer.h\"\n> #include \"parse-options.h\"\n> @@ -10,17 +13,22 @@ enum output_format {\n> };\n>\n> enum repo_info_category {\n> -\tCATEGORY_REFERENCES = 1\n> +\tCATEGORY_REFERENCES = 1,\n> +\tCATEGORY_LAYOUT = 1 << 1\n\nStyle: If we're doing this, then it also makes sense to use `1 << 0`.\n\n> };\n>\n> enum repo_info_references_field {\n> \tFIELD_REFERENCES_FORMAT = 1\n> };\n>\n> +enum repo_info_layout_field { FIELD_LAYOUT_BARE = 1\n> +};\n> +\n\nStyle: let's keep the styling consistent with the previous block.\n\n[snip]\n"},{"id":"520089","messageId":"CAOLa=ZQrJ06Se1+kZjCa2Mkhv7Q5gh8ZgtLh0usqZqTBPcVxSg@mail.gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-11T13:17:44Z","receivedAt":"2025-06-11T13:17:46Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n[snip]\n\n> ## Feedback\n>\n> I would like to ask for your feedback on this proprosal, specially:\n>\n> - on deciding if the JSON and linewise plaintext formats are the really the best,\n> or if I should consider others (e.g. gitconfig syntax, NUL-terminated, etc)\n>\n> - on deciding how the fields will be specified. This \".\" was\n> a first idea based on the JSON structure\n>\n> - about the JSON schema\n>\n> - about information that may be nice to include in the output of this command,\n> even if they are not currently retrieved by `rev-parse`\n>\n\nOne thing I'd also like to see is some thought/documentation of what\nkind of information should go into this command and what shouldn't. For\ne.g. should number of references in a repo be part of this command, or\nthe `git refs` command. More broadly, which subsystem information should\nbe exposed via `git repo-info` and how do we draw that line.\n\nMostly to not create a new `git rev-parse` alternative.\n\n> Thanks!\n>\n\nI've also gone ahead and reviewed the patches individually and left some\ncomments.\n\n- Karthik\n"},{"id":"520172","messageId":"xmqqecvpf1hk.fsf@gitster.g","threadId":"63618","inReplyTo":"CAOLa=ZTNpSKoFcfQHDOQNhq-jdFJvGEsXm-rYKrHCZG8CfaqaQ@mail.gmail.com","subject":"Re: [GSoC RFC PATCH 3/5] repo-info: add the field references.format","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-06-12T15:01:11Z","receivedAt":"2025-06-12T15:01:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n>> static void repo_info_init(struct repo_info *repo_info,\n>> \t\t\t struct repository *repo,\n>> \t\t\t char *format,\n>> -\t\t\t int allow_empty UNUSED,\n>> -\t\t\t int argc UNUSED,\n>> -\t\t\t const char **argv UNUSED\n>> +\t\t\t int allow_empty,\n>> +\t\t\t int argc,\n>> +\t\t\t const char **argv\n>> \t\t\t ) {\n>>\n>\n> Nit: we wrap to 80 chars generally, so you can put multiple arguments on\n> the same line.\n\nGood point. It is worth pointing out that we also group related\narguments together, and make it easier to later add new things at\nthe end and still keep related things together, e.g.,\n\nstatic void repo_info_init(struct repo_info *repo_info,\n\t\t\t struct repository *repo,\n int argc, const char **argv,\n\t\t\t const char *format,\n\t\t\t int allow_empty)\n{\n\nObviously argc, argv belong to each other, so it is OK to have on\nthe same line, and unlike repo_info (i.e. the out argument), repo\n(i.e. the primary thing that is inspected), format and allow_empty\nare something you would want to later extend when you \"enrich\" the\ninterface and functionality. You may even gain \"int display_width\"\nargument to allow line-wrapped output, for example, and you would\nhave to insert in the middle if you want to keep related things\ntogether, if you had (argc, argv) at the end. \n\nAlso note that {opening and closing braces} around the function body\nsits on their own lines.\n\nWhy is \"format\" a string? Shouldn't the caller do all the argument\nparsing and pass an enum or something to this function? After all,\nI presume that allow_empty is set in response to \"--allow-empty\" or\nsomething that the user gave to the command, and that parsing is done\nby the caller before it calls this function, no? Why not do the\nsame for the output format?\n\nI'll stop here for now.\n"},{"id":"520181","messageId":"5115663C-0F90-49A2-9925-389715618580@gmail.com","threadId":"63618","inReplyTo":"CAOLa=ZRFM5ZVyBfbpYjePN1c+cVBTfU-nk+hsQOGt5e1CJ3EXA@mail.gmail.com","subject":"Re: [GSoC RFC PATCH 2/5] repo-info: add the --format flag","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-12T17:56:05Z","receivedAt":"2025-06-12T17:56:20Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":">> Also add a flag --allow-empty, which will force the output data to be\n>> empty when no field is requested.\n>> \n> Why do you suppose we need this, I'm not against it, but it would be\n> nice to state why this is necessary. The idea is to have a default\n> output when a user runs `git repo-info`, so I'm missing why this would\n> be useful.\n\nI was thinking about use cases where repo-info is used inside scripts.\nA simple (but kinda useless...) example: an application that is a GUI\nfor this command, where the fields are selected in a checkbox, calling\nrepo-info with them and then displaying their contents in a dialog.\n\nIn this example, if no field is selected and there's no validation in\nthe GUI side, the default set of data will be retrieved. With\ngit repo-info --allow-empty, we don't need to care about it.\n\nBut, yeah, I agree that we don't need to think about it by now...\n\n> If I recall correctly, in our previous internal review, it was mentioned\n> that since we use perl here, we should add a PERL pre-requisite. Similar\n> to the one in 't/t0019-json-writer.sh'.\n\nDo you mean to use a `test_lazy_prereq`? I'll take a look on that.\n\n> As of this patch,\n> \n> $ ~/code/git/build/bin-wrappers/git repo-info\n> {\n> }\n> \n> $ ~/code/git/build/bin-wrappers/git repo-info --allow-empty\n> {\n> }\n> \n> So what differentiates the former from the latter?\n\nIn this patch, nothing. I was only trying to keep the consistency\nof each patch from 3 to 5 implementing only the code related to the\nfield, but it seems ok to me to squash this patch and the next one.\n\n> This is because we didn't implement plainttext no?\n\nYes!\n\n"},{"id":"520182","messageId":"CF0AD6B1-80D8-417D-9DFD-32338D9EC92A@gmail.com","threadId":"63618","inReplyTo":"CAOLa=ZTvC7Hq5Fz6N1ESzf1s=7kkyZG5iYTA6pzxnKm2p4oMNw@mail.gmail.com","subject":"Re: [GSoC RFC PATCH 4/5] repo-info: add field layout.bare","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-12T19:39:36Z","receivedAt":"2025-06-12T19:39:51Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"\n>> +#define USE_THE_REPOSITORY_VARIABLE\n>> \n> Ah! Seems like `is_bare_repository()` is responsible for this, it would\n> be nice to not introduce global dependency in a new command, but this\n> isn't part of your project, so it's okay here.\n\nYeah, to be honest I was reluctant to use this, and I tried to find if\nI could easily drop this dependency. But this is `is_bare_repository`:\n\nint is_bare_repository(void)\n{\n\t/* if core.bare is not 'false', let's see if there is a work tree */\n\treturn is_bare_repository_cfg && !repo_get_work_tree(the_repository);\n}\n\nBut I couldn't find out what is the dependency of is_bare_repository_cfg\non the_repository yet, but I decided to keep for this RFC.\n\n"},{"id":"520183","messageId":"xmqq7c1genyp.fsf@gitster.g","threadId":"63618","inReplyTo":"CF0AD6B1-80D8-417D-9DFD-32338D9EC92A@gmail.com","subject":"Re: [GSoC RFC PATCH 4/5] repo-info: add field layout.bare","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-06-12T19:53:18Z","receivedAt":"2025-06-12T19:53:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n>>> +#define USE_THE_REPOSITORY_VARIABLE\n>>> \n>> Ah! Seems like `is_bare_repository()` is responsible for this, it would\n>> be nice to not introduce global dependency in a new command, but this\n>> isn't part of your project, so it's okay here.\n>\n> Yeah, to be honest I was reluctant to use this, and I tried to find if\n> I could easily drop this dependency. But this is `is_bare_repository`:\n>\n> int is_bare_repository(void)\n> {\n> \t/* if core.bare is not 'false', let's see if there is a work tree */\n> \treturn is_bare_repository_cfg && !repo_get_work_tree(the_repository);\n> }\n>\n> But I couldn't find out what is the dependency of is_bare_repository_cfg\n> on the_repository yet, but I decided to keep for this RFC.\n\nI suspect that by the time setup_git_env() is called in the startup\nsequence from setup_git_directory(), we know that the repository\nknows if the repository is bare. So one thing we could do is to add\nis-bare-repository-cfg bit as a new member to the repo-settings\nobject of the_repository and record the bit before the\nsetup_git_directory() callchain returns.\n\nThen you can teach is_bare_repository() to take a repo object from\nits caller and the above may become something like\n\n\tint repository_is_bare(struct repository *r)\n\t{\n\t\treturn (r->settings.is_bare_repository &&\n\t\t\t!repo_get_work_tree(r));\n\t}\n\nperhaps.\n"},{"id":"520189","messageId":"2EB72983-BA77-47C3-9331-B08760B092C4@gmail.com","threadId":"63618","inReplyTo":"xmqqikl3mtx2.fsf@gitster.g","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-12T20:25:22Z","receivedAt":"2025-06-12T20:25:27Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"\n> OK, that's understandable, other than that handling of trailing\n> commas looks somewhat inconsistent.\n\nOoops, it was typo. I'm using the json_writer functions\n\n>> Or in a plaintext format, like this:\n>> \n>> ~~~\n>> $ git repo-info --format=plaintext\n>> sha1\n>> files\n>> /git/dir\n>> /git/common-dir\n>> /git/toplevel\n>> /super/working/tree\n>> false\n>> false\n>> ~~~\n> \n> This one is a bit questionable.\n> \n> Is it safe to assume that we will never have to deal with payload\n> controllable by the end-user that can have arbitrary byte values?\n\nI was trying to follow the behavior of rev-parse, where we can\ndo this:\n\ngit rev-parse --show-toplevel --is-bare-repository\n\nand it prints both the top level repositority and whether it is\na bare repository.\n\n> It would be uncommon but possible for LF to be in one of these\n> pathnames\n\nI tested here and this also happened with rev-parse:\n\n$ git init 'my\n repo'\n\n$ cd my\\nrepo/\n$ git rev-parse --show-toplevel\n/tmp/my\nrepo\n\nAnd this also happens passing other flags to rev-parse...\n\n> This one is OK.\n\nSo, after reading your review, I though about other solution:\n\n1. The user can provide only one field or no field\n2. If the user provide only one field, repo-info will return\n only its contents\n3. If the user don't provide any field, the default set of\n fields will be returned\n"},{"id":"520192","messageId":"xmqq4iwkd68p.fsf@gitster.g","threadId":"63618","inReplyTo":"2EB72983-BA77-47C3-9331-B08760B092C4@gmail.com","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-06-12T21:01:26Z","receivedAt":"2025-06-12T21:01:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n> I was trying to follow the behavior of rev-parse, where we can\n> do this:\n>\n> git rev-parse --show-toplevel --is-bare-repository\n\nAs often said, an earlier mistake is not an excuse to pile more of\nthem on top. Isn't the whole point of this new command to remove\nthese kitchen-sink options out of rev-parse and give them better\nhome? Let's learn from our earlier mistakes and do it right in the\nnew incarnation.\n\n> So, after reading your review, I though about other solution:\n>\n> 1. The user can provide only one field or no field\n> 2. If the user provide only one field, repo-info will return\n> only its contents\n> 3. If the user don't provide any field, the default set of\n> fields will be returned\n\nHmm. Isn't\n\n4. The output always comes out in JSON. There should be plenty JSON\n reading libraries available to the GUI command or whatever that\n forks this command and reads from it, right?\n\nan option? If we want textual format, and assume that almost all\nvalues are text, we could do something like\n\n 1. In text mode, the values are shown one-item-per-line, even if\n the value has embedded LF in it. At least we assume that the\n values do not contain a NUL byte.\n\n 2. If a value does not have LF or double-quote in it, it is output\n literally.\n\n 3. Otherwise, the value is shown with quote_c_style().\n\nThe implication of which is that a loosely written program that does\nnot grok funny values (namely, a string that contains a double-quote\nor a line-feed) can be written loosely without having to worry about\nquoting and assume one-line-per-item. They may show a wrong value,\nbut at least because one-line-per-item assumption holds, their\ninput/request and value they receive from the program will not go\nout of sync. And a more carefully written program can of course\ncheck the first byte to see if it is a double-quote, in which case\nthey have to unquote the whole line (which may yield a multi-line\nvalue if the quoted string had embedded \"\\n\"s).\n"},{"id":"520209","messageId":"CAOLa=ZQtZy_xwn5JWKB39maXJ7zSaO_SJQx6UCaomW+X+s_dPA@mail.gmail.com","threadId":"63618","inReplyTo":"5115663C-0F90-49A2-9925-389715618580@gmail.com","subject":"Re: [GSoC RFC PATCH 2/5] repo-info: add the --format flag","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-06-13T07:31:18Z","receivedAt":"2025-06-13T07:31:20Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n>>> Also add a flag --allow-empty, which will force the output data to be\n>>> empty when no field is requested.\n>>>\n>> Why do you suppose we need this, I'm not against it, but it would be\n>> nice to state why this is necessary. The idea is to have a default\n>> output when a user runs `git repo-info`, so I'm missing why this would\n>> be useful.\n>\n> I was thinking about use cases where repo-info is used inside scripts.\n> A simple (but kinda useless...) example: an application that is a GUI\n> for this command, where the fields are selected in a checkbox, calling\n> repo-info with them and then displaying their contents in a dialog.\n>\n> In this example, if no field is selected and there's no validation in\n> the GUI side, the default set of data will be retrieved. With\n> git repo-info --allow-empty, we don't need to care about it.\n>\n> But, yeah, I agree that we don't need to think about it by now...\n>\n>> If I recall correctly, in our previous internal review, it was mentioned\n>> that since we use perl here, we should add a PERL pre-requisite. Similar\n>> to the one in 't/t0019-json-writer.sh'.\n>\n> Do you mean to use a `test_lazy_prereq`? I'll take a look on that.\n>\n\nYes, that's the one.\n\n>> As of this patch,\n>>\n>> $ ~/code/git/build/bin-wrappers/git repo-info\n>> {\n>> }\n>>\n>> $ ~/code/git/build/bin-wrappers/git repo-info --allow-empty\n>> {\n>> }\n>>\n>> So what differentiates the former from the latter?\n>\n> In this patch, nothing. I was only trying to keep the consistency\n> of each patch from 3 to 5 implementing only the code related to the\n> field, but it seems ok to me to squash this patch and the next one.\n>\n>> This is because we didn't implement plainttext no?\n>\n> Yes!\n"},{"id":"520298","messageId":"C339DA52-F88A-4BC6-98DD-1586A1B4A175@gmail.com","threadId":"63618","inReplyTo":"xmqq4iwkd68p.fsf@gitster.g","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-16T22:19:23Z","receivedAt":"2025-06-16T22:19:37Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"\n> Let's learn from our earlier mistakes and do it right in the\n> new incarnation.\n\nOk, fair!\n\n> 1. In text mode, the values are shown one-item-per-line, even if\n> the value has embedded LF in it. At least we assume that the\n> values do not contain a NUL byte.\n> \n> 2. If a value does not have LF or double-quote in it, it is output\n> literally.\n> \n> 3. Otherwise, the value is shown with quote_c_style().\n\nHmmm, ok. So, I if I understood it correctly, is your idea to keep\nthe same functionality but using quote_c_style to keep one field\nper line?\n\n> The implication of which is that a loosely written program that does\n> not grok funny values (namely, a string that contains a double-quote\n> or a line-feed) can be written loosely without having to worry about\n> quoting and assume one-line-per-item. They may show a wrong value,\n> but at least because one-line-per-item assumption holds, their\n> input/request and value they receive from the program will not go\n> out of sync. And a more carefully written program can of course\n> check the first byte to see if it is a double-quote, in which case\n> they have to unquote the whole line (which may yield a multi-line\n> value if the quoted string had embedded \"\\n\"s).\n\nThanks again, Junio! \n"},{"id":"520301","messageId":"xmqqfrfzz4xq.fsf@gitster.g","threadId":"63618","inReplyTo":"C339DA52-F88A-4BC6-98DD-1586A1B4A175@gmail.com","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-06-16T22:40:01Z","receivedAt":"2025-06-16T22:40:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucas Seiki Oshiro writes:\n\n>> Let's learn from our earlier mistakes and do it right in the\n>> new incarnation.\n>\n> Ok, fair!\n>\n>> 1. In text mode, the values are shown one-item-per-line, even if\n>> the value has embedded LF in it. At least we assume that the\n>> values do not contain a NUL byte.\n>> \n>> 2. If a value does not have LF or double-quote in it, it is output\n>> literally.\n>> \n>> 3. Otherwise, the value is shown with quote_c_style().\n>\n> Hmmm, ok. So, I if I understood it correctly, is your idea to keep\n> the same functionality but using quote_c_style to keep one field\n> per line?\n\nI am not sure what you are comparing against with \"the same\" here,\nbut the idea is that not many items have problematic characters in\nthem anyway, and a simple-minded broken output parser can be written\nin 5 minutes and would happen to work correctly in more than 80% of\nrepositories ;-) A production quality tool needs to be aware of the\npossibility that they may need to unquote when they see a double-quote\nat the beginning of a line.\n\nBy the way, somebody wondered in a nearby message why we do not have\nthe \"key\" and only \"value\" in the textual output, and I share the\nsame sentiment. Where JSON may say\n\n \"path\": {\n \"git-dir\": \"/git/dir\"\n ...\n\ntext format may want to say\n\n path.git-dir=/git/dir\n\ninstead of just\n\n /git/dir\n\nBut I dunno. When asking a single item from the command line, it is\nperfectly fine to respond with a single value, but when you are\nshowing multiple items (especially without any \"give me this and\nthat item and nothing else\" specified on the command line, in which\ncase nobody knows in what order the value is given), I think the\ncalling script almost always wants to get key-value pairs.\n\nAlso are you planning on later adding a long-running server mode\nlike \"cat-file --batch-command\"?\n"},{"id":"520393","messageId":"110154E5-666B-4093-ABB0-ABAF2E3E107D@gmail.com","threadId":"63618","inReplyTo":"xmqqfrfzz4xq.fsf@gitster.g","subject":"Re: [GSoC RFC PATCH 0/5] repo-info: add new command for retrieving repository info","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T01:44:34Z","receivedAt":"2025-06-19T01:44:52Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"\n> But I dunno. When asking a single item from the command line, it is\n> perfectly fine to respond with a single value, but when you are\n> showing multiple items (especially without any \"give me this and\n> that item and nothing else\" specified on the command line, in which\n> case nobody knows in what order the value is given), I think the\n> calling script almost always wants to get key-value pairs.\n\nOk! I'm polishing my v2 and I expect to sent it soon. I already changed the\noutput to that format.\n\n> Also are you planning on later adding a long-running server mode\n> like \"cat-file --batch-command\"?\n\nTo be honest, I didn't know about that feature of cat-file until your comment.\nIt seems to be a nice feature to add, entering the keys and printing the\ncorresponding values.\n\nI'm adding a --batch-command feature and the removal of the dependency on\nthe_repository to a todo list to be considered in a future iteration on this\ncommand, after delivering its basic functionality.\n\nThanks!"},{"id":"520427","messageId":"20250619225751.99699-1-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250610152117.14826-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 0/7] repo-info: add new command for retrieving repository info","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:44Z","receivedAt":"2025-06-19T22:58:02Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Hi!\n\nThis is the second version of the repo-info RFC, and these are the main changes\nintroduced since v1:\n\n- The plaintext format now returns its fields in a key=value format\n\n- The tests were renumbered to t1900, since it's a new command (the previous was\n t1518, following the numbering of rev-parse)\n\n- The test function 'test_repo_info' now has a docstring, and it is more flexible\n for using more complex repository initializations\n\n- The flag --allow-empty is now introduced in its own commit\n\n- The plaintext and the JSON formats are now introduced in their own commits\n\n- The JSON format tests, which depends on the Perl's JSON module, are now marked\n with the PERLJSON lazy prereq, being skipped in environments that don't have\n that module installed\n\nSome things pointed in the last review weren't implemented as I prefer to do\nthem in another iteration of repo-info after having its basic functionality\nworking:\n\n- Remove the dependency on 'the_repository' when calling 'is_bare_repository'\n\n- Add a --batch-command mode, based on the --bath-command flag of cat-file,\n introduced in 440c705ea6 (cat-file: add --batch-command mode, 2022-02-18)\n\n- Use the category as key instead of only accepting category.key. In the current\n patchset, `git repo-info layout` would equivalent to\n `git repo-info layout.bare layout.shallow`\n\nI'm cc'ing my mentors and everyone that answered me in v1 and my GSoC blog. I'm\nstill open to any suggestions, requests and questions that you may have!\n\nHere's the range-diff of this v2:\n\n1: 20a3d131c3 ! 1: 102b5ce90a repo-info: declare the repo-info command\n @@ Commit message\n - git.c\n - .gitignore\n\n + In option parsing, use PARSE_OPT_KEEP_UNKNOWN_OPT to allow the users\n + specify after the flags the information that they want to retrieve.\n +\n Mentored-by: Karthik Nayak \n Mentored-by Patrick Steinhardt \n Signed-off-by: Lucas Seiki Oshiro \n @@ builtin/repo-info.c (new)\n +#include \"builtin.h\"\n +#include \"parse-options.h\"\n +\n -+int cmd_repo_info(\n -+\tint argc,\n -+\tconst char **argv,\n -+\tconst char *prefix,\n -+\tstruct repository *repo UNUSED\n -+\t)\n ++int cmd_repo_info(int argc,\n ++\t\t const char **argv,\n ++\t\t const char *prefix,\n ++\t\t struct repository *repo UNUSED)\n +{\n +\tconst char *const repo_info_usage[] = {\n +\t\t\"git repo-info\",\n @@ builtin/repo-info.c (new)\n +\t\tOPT_END()\n +\t};\n +\n -+\targc = parse_options(argc, argv, prefix, options, repo_info_usage, 0);\n ++\targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n ++\t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n +\n +\treturn 0;\n +}\n2: f78058c25a < -: ---------- repo-info: add the --format flag\n3: 3b2f534a69 < -: ---------- repo-info: add the field references.format\n-: ---------- > 2: 1cc1184663 repo-info: add the --format flag\n-: ---------- > 3: a329825387 repo-info: add plaintext as an output format\n-: ---------- > 4: 3b6c27b68d repo-info: add the --allow-empty flag\n-: ---------- > 5: 441b010175 repo-info: add the field references.format\n4: 5ad7e79f83 ! 6: f39086ea86 repo-info: add field layout.bare\n @@ builtin/repo-info.c\n +\n #include \"builtin.h\"\n +#include \"environment.h\"\n - #include \"hash.h\"\n ++#include \"hash.h\"\n #include \"json-writer.h\"\n #include \"parse-options.h\"\n +-#include \"refs.h\"\n + #include \"quote.h\"\n ++#include \"refs.h\"\n +\n + enum output_format {\n + \tFORMAT_JSON,\n @@ builtin/repo-info.c: enum output_format {\n };\n\n enum repo_info_category {\n --\tCATEGORY_REFERENCES = 1\n -+\tCATEGORY_REFERENCES = 1,\n +-\tCATEGORY_REFERENCES = 1 << 0\n ++\tCATEGORY_REFERENCES = 1 << 0,\n +\tCATEGORY_LAYOUT = 1 << 1\n };\n\n enum repo_info_references_field {\n - \tFIELD_REFERENCES_FORMAT = 1\n + \tFIELD_REFERENCES_FORMAT = 1 << 0\n };\n\n -+enum repo_info_layout_field { FIELD_LAYOUT_BARE = 1\n ++enum repo_info_layout_field {\n ++\tFIELD_LAYOUT_BARE = 1 << 0\n +};\n +\n struct repo_info_field {\n @@ builtin/repo-info.c: enum output_format {\n \t} field;\n };\n\n -@@ builtin/repo-info.c: struct repo_info {\n -\n - const char *default_fields[] = {\n - \t\"references.format\",\n -+\t\"layout.bare\"\n +@@ builtin/repo-info.c: static struct repo_info_field default_fields[] = {\n + \t{\n + \t\t.category = CATEGORY_REFERENCES,\n + \t\t.field.references = FIELD_REFERENCES_FORMAT\n ++\t},\n ++\t{\n ++\t\t.category = CATEGORY_LAYOUT,\n ++\t\t.field.layout = FIELD_LAYOUT_BARE\n + \t}\n };\n\n - static void repo_info_init(struct repo_info *repo_info,\n @@ builtin/repo-info.c: static void repo_info_init(struct repo_info *repo_info,\n - \t\t\tfield->category = CATEGORY_REFERENCES;\n - \t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n - \t\t}\n -+\t\telse if (!strcmp(arg, \"layout.bare\")) {\n -+\t\t\tfield->category = CATEGORY_LAYOUT;\n -+\t\t\tfield->field.layout = FIELD_LAYOUT_BARE;\n -+\t\t}\n - \t\telse {\n - \t\t\tdie(\"invalid field '%s'\", arg);\n - \t\t}\n + \t\t\tif (!strcmp(arg, \"references.format\")) {\n + \t\t\t\tfield->category = CATEGORY_REFERENCES;\n + \t\t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n ++\t\t\t} else if (!strcmp(arg, \"layout.bare\")) {\n ++\t\t\t\tfield->category = CATEGORY_LAYOUT;\n ++\t\t\t\tfield->field.layout = FIELD_LAYOUT_BARE;\n + \t\t\t} else {\n + \t\t\t\tdie(\"invalid field '%s'\", arg);\n + \t\t\t}\n @@ builtin/repo-info.c: static void repo_info_print_plaintext(struct repo_info *repo_info) {\n \t\t\t\tbreak;\n \t\t\t}\n @@ builtin/repo-info.c: static void repo_info_print_plaintext(struct repo_info *rep\n +\t\tcase CATEGORY_LAYOUT:\n +\t\t\tswitch (field->field.layout) {\n +\t\t\tcase FIELD_LAYOUT_BARE:\n -+\t\t\t\tputs(is_bare_repository() ? \"true\" : \"false\");\n ++\t\t\t\tprint_key_value(\"layout.bare\",\n ++\t\t\t\t\t\tis_bare_repository() ?\n ++\t\t\t\t\t\t\t\"true\" : \"false\");\n +\t\t\t\tbreak;\n +\t\t\t}\n +\t\t\tbreak;\n @@ builtin/repo-info.c: static void repo_info_print_json(struct repo_info *repo_inf\n\n \tputs(jw.json.buf);\n\n - ## t/t1518-repo-info.sh ##\n -@@ t/t1518-repo-info.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n + ## t/t1900-repo-info.sh ##\n +@@ t/t1900-repo-info.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n\n . ./test-lib.sh\n\n @@ t/t1518-repo-info.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n\n parse_json () {\n \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n -@@ t/t1518-repo-info.sh: test_repo_info () {\n - \t\ttest_when_finished 'rm -rf repo' &&\n - \t\tgit init $init_args repo &&\n - \t\tcd repo &&\n --\t\techo '$expected_value' >expect &&\n -+\t\techo '$expected_value' | sed 's/^false$/0/' | sed 's/^true$/1/' >expect &&\n - \t\tgit repo-info '$key'| parse_json >output &&\n - \t\tgrep -F 'row[0].$key' output | cut -d ' ' -f 2 >actual &&\n - \t\ttest_cmp expect actual\n -@@ t/t1518-repo-info.sh: test_repo_info 'ref format reftable is retrieved correctly' \\\n - \t'--ref-format=reftable' \\\n - \t'references.format' 'reftable'\n +@@ t/t1900-repo-info.sh: test_repo_info 'ref format files is retrieved correctly' '\n + test_repo_info 'ref format reftable is retrieved correctly' '\n + \tgit init --ref-format=reftable repo' 'references.format' 'reftable'\n\n -+test_repo_info 'bare repository = false is retrieved correctly' \\\n -+\t'' \\\n -+\t'layout.bare' 'false'\n ++test_repo_info 'bare repository = false is retrieved correctly' '\n ++\tgit init repo' 'layout.bare' 'false'\n +\n -+test_repo_info 'bare repository = true is retrieved correctly' \\\n -+\t'--bare' \\\n -+\t'layout.bare' 'true'\n ++test_repo_info 'bare repository = true is retrieved correctly' '\n ++\tgit init --bare repo' 'layout.bare' 'true'\n +\n test_expect_success 'plaintext: output all default fields' \"\n \tgit repo-info --format=plaintext >actual &&\n5: 0295c19951 < -: ---------- repo-info: add field layout.shallow\n-: ---------- > 7: 219b84f032 repo-info: add field layout.shallow\n\nLucas Seiki Oshiro (7):\n repo-info: declare the repo-info command\n repo-info: add the --format flag\n repo-info: add plaintext as an output format\n repo-info: add the --allow-empty flag\n repo-info: add the field references.format\n repo-info: add field layout.bare\n repo-info: add field layout.shallow\n\n .gitignore | 1 +\n Makefile | 1 +\n builtin.h | 1 +\n builtin/repo-info.c | 244 +++++++++++++++++++++++++++++++++++++++++++\n git.c | 1 +\n meson.build | 1 +\n t/meson.build | 1 +\n t/t1900-repo-info.sh | 105 +++++++++++++++++++\n 8 files changed, 355 insertions(+)\n create mode 100644 builtin/repo-info.c\n create mode 100755 t/t1900-repo-info.sh\n\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520428","messageId":"20250619225751.99699-2-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250619225751.99699-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 1/7] repo-info: declare the repo-info command","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:45Z","receivedAt":"2025-06-19T22:58:05Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Create a new Git subcommand called repo-info. `git repo-info` will query\nmetadata from the current repository and outputs it as JSON or plaintext.\n\nAlso add entries for this new command in:\n\n- the build files (Makefile and meson.build)\n- builtin.h\n- git.c\n- .gitignore\n\nIn option parsing, use PARSE_OPT_KEEP_UNKNOWN_OPT to allow the users\nspecify after the flags the information that they want to retrieve.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n .gitignore | 1 +\n Makefile | 1 +\n builtin.h | 1 +\n builtin/repo-info.c | 21 +++++++++++++++++++++\n git.c | 1 +\n meson.build | 1 +\n 6 files changed, 26 insertions(+)\n create mode 100644 builtin/repo-info.c\n\ndiff --git a/.gitignore b/.gitignore\nindex 04c444404e..b2f3fb0047 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -139,6 +139,7 @@\n /git-repack\n /git-replace\n /git-replay\n+/git-repo-info\n /git-request-pull\n /git-rerere\n /git-reset\ndiff --git a/Makefile b/Makefile\nindex 70d1543b6b..50e3a3cbcc 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1308,6 +1308,7 @@ BUILTIN_OBJS += builtin/remote.o\n BUILTIN_OBJS += builtin/repack.o\n BUILTIN_OBJS += builtin/replace.o\n BUILTIN_OBJS += builtin/replay.o\n+BUILTIN_OBJS += builtin/repo-info.o\n BUILTIN_OBJS += builtin/rerere.o\n BUILTIN_OBJS += builtin/reset.o\n BUILTIN_OBJS += builtin/rev-list.o\ndiff --git a/builtin.h b/builtin.h\nindex bff13e3069..cc6bc95962 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -216,6 +216,7 @@ int cmd_remote_ext(int argc, const char **argv, const char *prefix, struct repos\n int cmd_remote_fd(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_repack(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_replay(int argc, const char **argv, const char *prefix, struct repository *repo);\n+int cmd_repo_info(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_rerere(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_reset(int argc, const char **argv, const char *prefix, struct repository *repo);\n int cmd_restore(int argc, const char **argv, const char *prefix, struct repository *repo);\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nnew file mode 100644\nindex 0000000000..a5c43e253f\n--- /dev/null\n+++ b/builtin/repo-info.c\n@@ -0,0 +1,21 @@\n+#include \"builtin.h\"\n+#include \"parse-options.h\"\n+\n+int cmd_repo_info(int argc,\n+\t\t const char **argv,\n+\t\t const char *prefix,\n+\t\t struct repository *repo UNUSED)\n+{\n+\tconst char *const repo_info_usage[] = {\n+\t\t\"git repo-info\",\n+\t\tNULL\n+\t};\n+\tstruct option options[] = {\n+\t\tOPT_END()\n+\t};\n+\n+\targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n+\t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n+\n+\treturn 0;\n+}\ndiff --git a/git.c b/git.c\nindex 07a5fe39fb..27a2b3569b 100644\n--- a/git.c\n+++ b/git.c\n@@ -611,6 +611,7 @@ static struct cmd_struct commands[] = {\n \t{ \"repack\", cmd_repack, RUN_SETUP },\n \t{ \"replace\", cmd_replace, RUN_SETUP },\n \t{ \"replay\", cmd_replay, RUN_SETUP },\n+\t{ \"repo-info\", cmd_repo_info, RUN_SETUP },\n \t{ \"rerere\", cmd_rerere, RUN_SETUP },\n \t{ \"reset\", cmd_reset, RUN_SETUP },\n \t{ \"restore\", cmd_restore, RUN_SETUP | NEED_WORK_TREE },\ndiff --git a/meson.build b/meson.build\nindex 7fea4a34d6..06f2f647ba 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -645,6 +645,7 @@ builtin_sources = [\n 'builtin/repack.c',\n 'builtin/replace.c',\n 'builtin/replay.c',\n+ 'builtin/repo-info.c',\n 'builtin/rerere.c',\n 'builtin/reset.c',\n 'builtin/rev-list.c',\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520429","messageId":"20250619225751.99699-3-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250619225751.99699-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 2/7] repo-info: add the --format flag","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:46Z","receivedAt":"2025-06-19T22:58:08Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the --format flag to the repo-info command, allowing the user to\nchoose between output formats. Use 'json' by default.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 54 +++++++++++++++++++++++++++++++++++++++++++-\n t/meson.build | 1 +\n t/t1900-repo-info.sh | 22 ++++++++++++++++++\n 3 files changed, 76 insertions(+), 1 deletion(-)\n create mode 100755 t/t1900-repo-info.sh\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex a5c43e253f..cbe1475e30 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -1,21 +1,73 @@\n #include \"builtin.h\"\n+#include \"json-writer.h\"\n #include \"parse-options.h\"\n \n+enum output_format {\n+\tFORMAT_JSON\n+};\n+\n+struct repo_info {\n+\tstruct repository *repo;\n+\tenum output_format format;\n+};\n+\n+static void repo_info_init(struct repo_info *repo_info,\n+\t\t\t struct repository *repo,\n+\t\t\t char *format)\n+{\n+\trepo_info->repo = repo;\n+\n+\tif (format == NULL || !strcmp(format, \"json\"))\n+\t\trepo_info->format = FORMAT_JSON;\n+\telse\n+\t\tdie(\"invalid format %s\", format);\n+}\n+\n+static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n+{\n+\tstruct json_writer jw;\n+\n+\tjw_init(&jw);\n+\n+\tjw_object_begin(&jw, 1);\n+\tjw_end(&jw);\n+\n+\tputs(jw.json.buf);\n+\tjw_release(&jw);\n+}\n+\n+static void repo_info_print(struct repo_info *repo_info)\n+{\n+\tenum output_format format = repo_info->format;\n+\n+\tswitch (format) {\n+\tcase FORMAT_JSON:\n+\t\trepo_info_print_json(repo_info);\n+\t\tbreak;\n+\t}\n+}\n+\n int cmd_repo_info(int argc,\n \t\t const char **argv,\n \t\t const char *prefix,\n-\t\t struct repository *repo UNUSED)\n+\t\t struct repository *repo)\n {\n \tconst char *const repo_info_usage[] = {\n \t\t\"git repo-info\",\n \t\tNULL\n \t};\n+\tstruct repo_info repo_info;\n+\tchar *format = NULL;\n \tstruct option options[] = {\n+\t\tOPT_STRING(0, \"format\", &format, N_(\"format\"),\n+\t\t\t N_(\"output format\")),\n \t\tOPT_END()\n \t};\n \n \targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n \t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n+\trepo_info_init(&repo_info, repo, format);\n+\trepo_info_print(&repo_info);\n \n \treturn 0;\n }\ndiff --git a/t/meson.build b/t/meson.build\nindex 50e89e764a..d9ecaba3b7 100644\n--- a/t/meson.build\n+++ b/t/meson.build\n@@ -246,6 +246,7 @@ integration_tests = [\n 't1700-split-index.sh',\n 't1701-racy-split-index.sh',\n 't1800-hook.sh',\n+ 't1900-repo-info.sh',\n 't2000-conflict-when-checking-files-out.sh',\n 't2002-checkout-cache-u.sh',\n 't2003-checkout-cache-mkdir.sh',\ndiff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh\nnew file mode 100755\nindex 0000000000..f634e1a285\n--- /dev/null\n+++ b/t/t1900-repo-info.sh\n@@ -0,0 +1,22 @@\n+#!/bin/sh\n+\n+test_description='test git repo-info'\n+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n+\n+. ./test-lib.sh\n+\n+parse_json () {\n+\ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n+}\n+\n+test_lazy_prereq PERLJSON '\n+\tperl -MJSON -e \"exit 0\"\n+'\n+\n+test_expect_success PERLJSON 'json: returns empty output with allow-empty' '\n+\tgit repo-info --format=json >output &&\n+\ttest_line_count = 2 output\n+'\n+\n+test_done\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520430","messageId":"20250619225751.99699-4-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250619225751.99699-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 3/7] repo-info: add plaintext as an output format","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:47Z","receivedAt":"2025-06-19T22:58:10Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add 'plaintext' as an output format of repo-info. This output format is\ncomposed zero or more key=value pairs, one per line.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 12 +++++++++++-\n t/t1900-repo-info.sh | 4 ++++\n 2 files changed, 15 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex cbe1475e30..cd7c110f47 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -3,7 +3,8 @@\n #include \"parse-options.h\"\n \n enum output_format {\n-\tFORMAT_JSON\n+\tFORMAT_JSON,\n+\tFORMAT_PLAINTEXT\n };\n \n struct repo_info {\n@@ -19,10 +20,16 @@ static void repo_info_init(struct repo_info *repo_info,\n \n \tif (format == NULL || !strcmp(format, \"json\"))\n \t\trepo_info->format = FORMAT_JSON;\n+\telse if (!strcmp(format, \"plaintext\"))\n+\t\trepo_info->format = FORMAT_PLAINTEXT;\n \telse\n \t\tdie(\"invalid format %s\", format);\n }\n \n+static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED)\n+{\n+}\n+\n static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n {\n \tstruct json_writer jw;\n@@ -44,6 +51,9 @@ static void repo_info_print(struct repo_info *repo_info)\n \tcase FORMAT_JSON:\n \t\trepo_info_print_json(repo_info);\n \t\tbreak;\n+\tcase FORMAT_PLAINTEXT:\n+\t\trepo_info_print_plaintext(repo_info);\n+\t\tbreak;\n \t}\n }\n \ndiff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh\nindex f634e1a285..998c835795 100755\n--- a/t/t1900-repo-info.sh\n+++ b/t/t1900-repo-info.sh\n@@ -18,5 +18,9 @@ test_expect_success PERLJSON 'json: returns empty output with allow-empty' '\n \tgit repo-info --format=json >output &&\n \ttest_line_count = 2 output\n '\n+test_expect_success 'plaintext: returns empty output with allow-empty' '\n+\tgit repo-info --format=plaintext >output &&\n+\ttest_line_count = 0 output\n+'\n \n test_done\n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520431","messageId":"20250619225751.99699-5-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250619225751.99699-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 4/7] repo-info: add the --allow-empty flag","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:48Z","receivedAt":"2025-06-19T22:58:13Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add a flag --allow-empty, which will force the output data to be empty\nwhen no field is requested.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 3 +++\n t/t1900-repo-info.sh | 5 +++--\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex cd7c110f47..6499be0eae 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -68,9 +68,12 @@ int cmd_repo_info(int argc,\n \t};\n \tstruct repo_info repo_info;\n \tchar *format = NULL;\n+\tint allow_empty = 0;\n \tstruct option options[] = {\n \t\tOPT_STRING(0, \"format\", &format, N_(\"format\"),\n \t\t\t N_(\"output format\")),\n+\t\tOPT_BOOL(0, \"allow-empty\", &allow_empty,\n+\t\t\t \"when set, it will use an empty set of fields if no field is requested\"),\n \t\tOPT_END()\n \t};\n \ndiff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh\nindex 998c835795..db4a6aad17 100755\n--- a/t/t1900-repo-info.sh\n+++ b/t/t1900-repo-info.sh\n@@ -15,11 +15,12 @@ test_lazy_prereq PERLJSON '\n '\n \n test_expect_success PERLJSON 'json: returns empty output with allow-empty' '\n-\tgit repo-info --format=json >output &&\n+\tgit repo-info --allow-empty --format=json >output &&\n \ttest_line_count = 2 output\n '\n+\n test_expect_success 'plaintext: returns empty output with allow-empty' '\n-\tgit repo-info --format=plaintext >output &&\n+\tgit repo-info --allow-empty --format=plaintext >output &&\n \ttest_line_count = 0 output\n '\n \n-- \n2.39.5 (Apple Git-154)\n\n"},{"id":"520432","messageId":"20250619225751.99699-6-lucasseikioshiro@gmail.com","threadId":"63618","inReplyTo":"20250619225751.99699-1-lucasseikioshiro@gmail.com","subject":"[GSoC RFC PATCH v2 5/7] repo-info: add the field references.format","fromName":"Lucas Seiki Oshiro","fromEmail":"lucasseikioshiro@gmail.com","sentAt":"2025-06-19T22:57:49Z","receivedAt":"2025-06-19T22:58:16Z","isPatch":true,"sender":{"key":"lucasseikioshiro@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701580?v=4"},"body":"Add the field references.format to the repo-info command. The data\nretrieved in this field is the same that currently is obtained by\nrunning `git rev-parse --show-ref-format`.\n\nMentored-by: Karthik Nayak \nMentored-by Patrick Steinhardt \nSigned-off-by: Lucas Seiki Oshiro \n---\n builtin/repo-info.c | 108 +++++++++++++++++++++++++++++++++++++++++--\n t/t1900-repo-info.sh | 58 +++++++++++++++++++++++\n 2 files changed, 162 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/repo-info.c b/builtin/repo-info.c\nindex 6499be0eae..6ce3e6134f 100644\n--- a/builtin/repo-info.c\n+++ b/builtin/repo-info.c\n@@ -1,21 +1,56 @@\n #include \"builtin.h\"\n #include \"json-writer.h\"\n #include \"parse-options.h\"\n+#include \"quote.h\"\n+#include \"refs.h\"\n \n enum output_format {\n \tFORMAT_JSON,\n \tFORMAT_PLAINTEXT\n };\n \n+enum repo_info_category {\n+\tCATEGORY_REFERENCES = 1 << 0\n+};\n+\n+enum repo_info_references_field {\n+\tFIELD_REFERENCES_FORMAT = 1 << 0\n+};\n+\n+struct repo_info_field {\n+\tenum repo_info_category category;\n+\tunion {\n+\t\tenum repo_info_references_field references;\n+\t} field;\n+};\n+\n struct repo_info {\n \tstruct repository *repo;\n \tenum output_format format;\n+\tint n_fields;\n+\tstruct repo_info_field *fields;\n };\n \n+static struct repo_info_field default_fields[] = {\n+\t{\n+\t\t.category = CATEGORY_REFERENCES,\n+\t\t.field.references = FIELD_REFERENCES_FORMAT\n+\t}\n+};\n+\n+static void print_key_value(const char *key, const char *value) {\n+\tprintf(\"%s=\", key);\n+\tquote_c_style(value, NULL, stdout, 0);\n+\tputchar('\\n');\n+}\n+\n static void repo_info_init(struct repo_info *repo_info,\n \t\t\t struct repository *repo,\n-\t\t\t char *format)\n+\t\t\t char *format,\n+\t\t\t int allow_empty,\n+\t\t\t int argc, const char **argv)\n {\n+\tint i;\n \trepo_info->repo = repo;\n \n \tif (format == NULL || !strcmp(format, \"json\"))\n@@ -24,19 +59,83 @@ static void repo_info_init(struct repo_info *repo_info,\n \t\trepo_info->format = FORMAT_PLAINTEXT;\n \telse\n \t\tdie(\"invalid format %s\", format);\n+\n+\tif (argc == 0 && !allow_empty) {\n+\t\trepo_info->n_fields = ARRAY_SIZE(default_fields);\n+\t\trepo_info->fields = default_fields;\n+\t} else {\n+\t\trepo_info->n_fields = argc;\n+\t\tALLOC_ARRAY(repo_info->fields, argc);\n+\n+\t\tfor (i = 0; i < argc; i++) {\n+\t\t\tconst char *arg = argv[i];\n+\t\t\tstruct repo_info_field *field = repo_info->fields + i;\n+\n+\t\t\tif (!strcmp(arg, \"references.format\")) {\n+\t\t\t\tfield->category = CATEGORY_REFERENCES;\n+\t\t\t\tfield->field.references = FIELD_REFERENCES_FORMAT;\n+\t\t\t} else {\n+\t\t\t\tdie(\"invalid field '%s'\", arg);\n+\t\t\t}\n+\t\t}\n+\t}\n }\n \n-static void repo_info_print_plaintext(struct repo_info *repo_info UNUSED)\n+static void repo_info_release(struct repo_info *repo_info)\n {\n+\tif (repo_info->fields != default_fields) free(repo_info->fields);\n }\n \n-static void repo_info_print_json(struct repo_info *repo_info UNUSED)\n+static void repo_info_print_plaintext(struct repo_info *repo_info) {\n+\tstruct repository *repo = repo_info->repo;\n+\tint i;\n+\tfor (i = 0; i < repo_info->n_fields; i++) {\n+\t\tstruct repo_info_field *field = &repo_info->fields[i];\n+\t\tswitch (field->category) {\n+\t\tcase CATEGORY_REFERENCES:\n+\t\t\tswitch (field->field.references) {\n+\t\t\tcase FIELD_REFERENCES_FORMAT:\n+\t\t\t\tprint_key_value(\"references.format\",\n+\t\t\t\t\t\tref_storage_format_to_name(\n+\t\t\t\t\t\t\trepo->ref_storage_format));\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+}\n+\n+static void repo_info_print_json(struct repo_info *repo_info)\n {\n \tstruct json_writer jw;\n+\tint i;\n+\tunsigned int categories = 0;\n+\tunsigned int references_fields = 0;\n+\tstruct repository *repo = repo_info->repo;\n+\n+\tfor (i = 0; i < repo_info->n_fields; i++) {\n+\t\tstruct repo_info_field *field = repo_info->fields + i;\n+\t\tcategories |= field->category;\n+\t\tswitch (field->category) {\n+\t\tcase CATEGORY_REFERENCES:\n+\t\t\treferences_fields |= field->field.references;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n \n \tjw_init(&jw);\n \n \tjw_object_begin(&jw, 1);\n+\n+\tif (categories & CATEGORY_REFERENCES) {\n+\t\tjw_object_inline_begin_object(&jw, \"references\");\n+\t\tif (references_fields & FIELD_REFERENCES_FORMAT) {\n+\t\t\tconst char *format_name = ref_storage_format_to_name(\n+\t\t\t\trepo->ref_storage_format);\n+\t\t\tjw_object_string(&jw, \"format\", format_name);\n+\t\t}\n+\t\tjw_end(&jw);\n+\t}\n \tjw_end(&jw);\n \n \tputs(jw.json.buf);\n@@ -79,8 +178,9 @@ int cmd_repo_info(int argc,\n \n \targc = parse_options(argc, argv, prefix, options, repo_info_usage,\n \t\t\t PARSE_OPT_KEEP_UNKNOWN_OPT);\n-\trepo_info_init(&repo_info, repo, format);\n+\trepo_info_init(&repo_info, repo, format, allow_empty, argc, argv);\n \trepo_info_print(&repo_info);\n+\trepo_info_release(&repo_info);\n \n \treturn 0;\n }\ndiff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh\nindex db4a6aad17..d6e6f6ed1d 100755\n--- a/t/t1900-repo-info.sh\n+++ b/t/t1900-repo-info.sh\n@@ -6,6 +6,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n+DEFAULT_NUMBER_OF_FIELDS=1\n+\n parse_json () {\n \ttr '\\n' ' ' | \"$PERL_PATH\" \"$TEST_DIRECTORY/t0019/parse_json.perl\"\n }\n@@ -14,6 +16,45 @@ test_lazy_prereq PERLJSON '\n \tperl -MJSON -e \"exit 0\"\n '\n \n+# Test if a field is correctly returned in both plaintext and json formats.\n+#\n+# Usage: test_repo_info