From: Lucas Seiki Oshiro <lucasseikioshiro@gmail•com>
To: git@vger•kernel.org
Cc: ps@pks•im, gitster@pobox•com, jltobler@gmail•com,
avila.jn@gmail•com,
Lucas Seiki Oshiro <lucasseikioshiro@gmail•com>
Subject: [PATCH v5 0/2] repo: add --keys and rename "keyvalue" to "lines"
Date: Fri, 23 Jan 2026 13:34:52 -0300 [thread overview]
Message-ID: <20260123164900.35092-1-lucasseikioshiro@gmail.com> (raw)
In-Reply-To: <20251207190532.67107-1-lucasseikioshiro@gmail.com>
Hi!
There are two main changes in this v5:
- the "keyvalue" output format of git-repo-info and git-repo-structure were
both renamed by "lines"
- the "default" output format was dropped
This way:
- `git repo info` accepts --format=lines and --format=nul
- `git repo info --keys` accepts --format=lines and --format=nul
- `git repo structure` accepts --format=table, --format=lines and --format=nul
Lucas Seiki Oshiro (2):
repo: rename "keyvalue" to "lines"
repo: add new flag --keys to git-repo-info
Documentation/git-repo.adoc | 32 +++++++++++++++--------
builtin/repo.c | 51 ++++++++++++++++++++++++++++++-------
t/t1900-repo.sh | 44 ++++++++++++++++++++++----------
t/t1901-repo-structure.sh | 4 +--
4 files changed, 97 insertions(+), 34 deletions(-)
Range-diff against v4:
1: 7dabd62250 < -: ---------- repo: add a default output format to enum output_format
-: ---------- > 1: f5448ce915 repo: rename "keyvalue" to "lines"
2: fba621fc4f ! 2: 16bc72afe1 repo: add new flag --keys to git-repo-info
@@ Documentation/git-repo.adoc
@@ Documentation/git-repo.adoc: SYNOPSIS
--------
[synopsis]
- git repo info [--format=(default|keyvalue|nul) | -z] [--all | <key>...]
-+git repo info --keys [--format=(default|lines|nul) | -z]
- git repo structure [--format=(default|table|keyvalue|nul) | -z]
+ git repo info [--format=(lines|nul) | -z] [--all | <key>...]
++git repo info --keys [--format=(lines|nul) | -z]
+ git repo structure [--format=(table|lines|nul) | -z]
DESCRIPTION
@@ Documentation/git-repo.adoc: supported:
+
`-z` is an alias for `--format=nul`.
-+`info --keys [--format=(default|lines|nul) | -z]`::
++`info --keys [--format=(lines|nul) | -z]`::
+ List all the available keys, one per line. The output format can be chosen
+ through the flag `--format`. The following formats are supported:
++
-+`default`:::
-+ synonym for `lines`.
-+
+`lines`:::
-+ output the keys one per line.
++ output the keys one per line. This is the default.
+
+`nul`:::
-+ similar to `default`, but using a _NUL_ character after each value.
++ similar to `lines`, but using a _NUL_ character after each value.
+
- `structure [--format=(default|table|keyvalue|nul) | -z]`::
+ `structure [--format=(table|lines|nul) | -z]`::
Retrieve statistics about the current repository structure. The
following kinds of information are reported:
@@ builtin/repo.c
@@
static const char *const repo_usage[] = {
- "git repo info [--format=(default|keyvalue|nul) | -z] [--all | <key>...]",
-+ "git repo info --keys [--format=(default|lines|nul) | -z]",
- "git repo structure [--format=(default|table|keyvalue|nul) | -z]",
+ "git repo info [--format=(lines|nul) | -z] [--all | <key>...]",
++ "git repo info --keys [--format=(lines|nul) | -z]",
+ "git repo structure [--format=(table|lines|nul) | -z]",
NULL
};
-@@ builtin/repo.c: enum output_format {
- FORMAT_TABLE,
- FORMAT_KEYVALUE,
- FORMAT_NUL_TERMINATED,
-+ FORMAT_LINES
- };
-
- struct field {
@@ builtin/repo.c: static int print_all_fields(struct repository *repo,
return 0;
}
@@ builtin/repo.c: static int print_all_fields(struct repository *repo,
+{
+ char sep;
+
-+ if (format == FORMAT_DEFAULT)
-+ format = FORMAT_LINES;
-+
+ switch (format) {
+ case FORMAT_LINES:
+ sep = '\n';
@@ builtin/repo.c: static int print_all_fields(struct repository *repo,
+ sep = '\0';
+ break;
+ default:
-+ die(_("--keys can only be used with --format=default or --format=nul"));
++ die(_("--keys can only be used with --format=lines or --format=nul"));
+ }
+
+ for (size_t i = 0; i < ARRAY_SIZE(repo_info_fields); i++) {
@@ builtin/repo.c: static int print_all_fields(struct repository *repo,
static int parse_format_cb(const struct option *opt,
const char *arg, int unset UNUSED)
{
-@@ builtin/repo.c: static int parse_format_cb(const struct option *opt,
- *format = FORMAT_KEYVALUE;
- else if (!strcmp(arg, "table"))
- *format = FORMAT_TABLE;
-+ else if (!strcmp(arg, "lines"))
-+ *format = FORMAT_LINES;
- else if (!strcmp(arg, "default"))
- *format = FORMAT_DEFAULT;
- else
@@ builtin/repo.c: static int cmd_repo_info(int argc, const char **argv, const char *prefix,
{
- enum output_format format = FORMAT_DEFAULT;
+ enum output_format format = FORMAT_LINES;
int all_keys = 0;
+ int show_keys = 0;
struct option options[] = {
@@ builtin/repo.c: static int cmd_repo_info(int argc, const char **argv, const char
+ if (show_keys)
+ return print_keys(format);
+
- if (format == FORMAT_DEFAULT)
- format = FORMAT_KEYVALUE;
+ if (format != FORMAT_LINES && format != FORMAT_NUL_TERMINATED)
+ die(_("unsupported output format"));
## t/t1900-repo.sh ##
@@ t/t1900-repo.sh: test_expect_success 'git repo info uses the last requested form
git repo info --all >actual &&
test_cmp expect actual
'
-@@ t/t1900-repo.sh: test_expect_success '--format=default resets the format' '
+@@ t/t1900-repo.sh: test_expect_success 'git repo info --all <key> aborts' '
test_cmp expect actual
'
+test_expect_success 'git repo info --keys --format=nul uses nul-terminated output' '
-+ git repo info --keys --format=default >default &&
-+ lf_to_nul <default >expect &&
++ git repo info --keys --format=lines >lines &&
++ lf_to_nul <lines >expect &&
+ git repo info --keys --format=nul >actual &&
+ test_cmp expect actual
+'
+
-+test_expect_success 'git repo info --keys aborts when using --format other than default or nul' '
-+ echo "fatal: --keys can only be used with --format=default or --format=nul" >expect &&
-+ test_must_fail git repo info --keys --format=keyvalue 2>actual &&
++test_expect_success 'git repo info --keys aborts when using --format other than lines or nul' '
++ echo "fatal: --keys can only be used with --format=lines or --format=nul" >expect &&
++ test_must_fail git repo info --keys --format=table 2>actual &&
+ test_cmp expect actual
+'
+
@@ t/t1900-repo.sh: test_expect_success '--format=default resets the format' '
+
+test_expect_success 'git repo info --keys uses lines as its default output format' '
+ git repo info --keys --format=lines >expect &&
-+ git repo info --keys --format=default >actual_explicit &&
-+ git repo info --keys >actual_implicit &&
-+ test_cmp expect actual_explicit &&
-+ test_cmp expect actual_implicit
++ git repo info --keys >actual &&
++ test_cmp expect actual
+'
+
test_done
--
2.50.1 (Apple Git-155)
next prev parent reply other threads:[~2026-01-23 16:49 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-07 19:02 [PATCH] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2025-12-07 22:14 ` Junio C Hamano
2025-12-08 16:33 ` Lucas Seiki Oshiro
2025-12-08 7:13 ` Patrick Steinhardt
2025-12-09 19:36 ` [PATCH v2 0/2] " Lucas Seiki Oshiro
2025-12-09 19:36 ` [PATCH v2 1/2] repo: add a default output format to enum output_format Lucas Seiki Oshiro
2026-01-05 14:18 ` Patrick Steinhardt
2026-01-07 21:28 ` Lucas Seiki Oshiro
2026-01-08 6:13 ` Patrick Steinhardt
2025-12-09 19:36 ` [PATCH v2 2/2] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2026-01-05 14:18 ` Patrick Steinhardt
2026-01-05 13:57 ` [PATCH v2 0/2] " Lucas Seiki Oshiro
2026-01-05 14:19 ` Patrick Steinhardt
2026-01-09 20:31 ` [PATCH v3 0/2] repo: add --format=default and --keys Lucas Seiki Oshiro
2026-01-10 6:48 ` Junio C Hamano
2026-01-10 7:02 ` Junio C Hamano
2026-01-09 20:31 ` [PATCH v3 1/2] repo: add a default output format to enum output_format Lucas Seiki Oshiro
2026-01-09 20:31 ` [PATCH v3 2/2] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2026-01-10 12:04 ` Jean-Noël AVILA
2026-01-10 22:00 ` Lucas Seiki Oshiro
2026-01-12 8:40 ` Patrick Steinhardt
2026-01-19 20:20 ` [PATCH v4 0/2] repo: add --format=default and --keys Lucas Seiki Oshiro
2026-01-19 20:20 ` [PATCH v4 1/2] repo: add a default output format to enum output_format Lucas Seiki Oshiro
2026-01-19 20:20 ` [PATCH v4 2/2] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2026-01-20 6:05 ` Patrick Steinhardt
2026-01-20 23:11 ` Lucas Seiki Oshiro
2026-01-21 7:19 ` Patrick Steinhardt
2026-01-21 14:38 ` Lucas Seiki Oshiro
2026-01-20 0:52 ` [PATCH v4 0/2] repo: add --format=default and --keys Junio C Hamano
2026-01-23 16:34 ` Lucas Seiki Oshiro [this message]
2026-01-23 16:34 ` [PATCH v5 1/2] repo: rename "keyvalue" to "lines" Lucas Seiki Oshiro
2026-01-27 6:58 ` Patrick Steinhardt
2026-01-23 16:34 ` [PATCH v5 2/2] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2026-01-27 6:58 ` Patrick Steinhardt
2026-01-27 22:27 ` Lucas Seiki Oshiro
2026-02-14 0:35 ` [PATCH v6 0/2] repo: add --keys and rename "keyvalue" to "lines" Lucas Seiki Oshiro
2026-02-14 0:35 ` [PATCH v6 1/2] repo: rename the output format " Lucas Seiki Oshiro
2026-02-14 0:35 ` [PATCH v6 2/2] repo: add new flag --keys to git-repo-info Lucas Seiki Oshiro
2026-02-14 18:14 ` [PATCH v6 0/2] repo: add --keys and rename "keyvalue" to "lines" Junio C Hamano
2026-02-16 6:59 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260123164900.35092-1-lucasseikioshiro@gmail.com \
--to=lucasseikioshiro@gmail$(echo .)com \
--cc=avila.jn@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jltobler@gmail$(echo .)com \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox