[PATCH v2 01/13] config: move show_all_config()
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Feb 13, 2026, 23:55 UTC
- Message-ID
- <bca83d8ca86ead4df5cd424a8356367915248c43.1771026918.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2044.v2.git.1771026918.gitgitgadget@gmail.com>
From: Derrick Stolee <stolee@gmail.com>
In anticipation of using format_config() in this method, move show_all_config() lower in the file without changes.
Signed-off-by: Derrick Stolee <stolee@gmail.com> --- builtin/config.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 288ebdfdaa..237f7a934d 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -231,30 +231,6 @@ static void show_config_scope(const struct config_display_options *opts, strbuf_addch(buf, term); } -static int show_all_config(const char *key_, const char *value_, - const struct config_context *ctx, - void *cb) -{ - const struct config_display_options *opts = cb; - const struct key_value_info *kvi = ctx->kvi; - - if (opts->show_origin || opts->show_scope) { - struct strbuf buf = STRBUF_INIT; - if (opts->show_scope) - show_config_scope(opts, kvi, &buf); - if (opts->show_origin) - show_config_origin(opts, kvi, &buf); - /* Use fwrite as "buf" can contain \0's if "end_null" is set. */ - fwrite(buf.buf, 1, buf.len, stdout); - strbuf_release(&buf); - } - if (!opts->omit_values && value_) - printf("%s%c%s%c", key_, opts->delim, value_, opts->term); - else - printf("%s%c", key_, opts->term); - return 0; -} - struct strbuf_list { struct strbuf *items; int nr; @@ -332,6 +308,30 @@ static int format_config(const struct config_display_options *opts, return 0; } +static int show_all_config(const char *key_, const char *value_, + const struct config_context *ctx, + void *cb) +{ + const struct config_display_options *opts = cb; + const struct key_value_info *kvi = ctx->kvi; + + if (opts->show_origin || opts->show_scope) { + struct strbuf buf = STRBUF_INIT; + if (opts->show_scope) + show_config_scope(opts, kvi, &buf); + if (opts->show_origin) + show_config_origin(opts, kvi, &buf); + /* Use fwrite as "buf" can contain \0's if "end_null" is set. */ + fwrite(buf.buf, 1, buf.len, stdout); + strbuf_release(&buf); + } + if (!opts->omit_values && value_) + printf("%s%c%s%c", key_, opts->delim, value_, opts->term); + else + printf("%s%c", key_, opts->term); + return 0; +} + #define GET_VALUE_ALL (1 << 0) #define GET_VALUE_KEY_REGEXP (1 << 1)
-- gitgitgadget