admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ac/deglobal-fmt-merge-log-config'

Browse Source 
Code clean-up.

* ac/deglobal-fmt-merge-log-config:
  builtin/fmt-merge-msg: stop depending on 'the_repository'
  environment: remove the global variable 'merge_log_config'
This commit is contained in:
Junio C Hamano
2025-08-22 13:13:21 -07:00
parent 72e4eb56f0 22d421fed9
commit 9d6e319ec5
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/fmt-merge-msg.c
View File

@@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h" #include "builtin.h"
#include "config.h" #include "config.h"
#include "fmt-merge-msg.h" #include "fmt-merge-msg.h"
@@ -13,12 +12,13 @@ static const char * const fmt_merge_msg_usage[] = {
int cmd_fmt_merge_msg(int argc, int cmd_fmt_merge_msg(int argc,
const char **argv, const char **argv,
const char *prefix, const char *prefix,
struct repository *repo UNUSED) struct repository *repo)
{ {
char *inpath = NULL; char *inpath = NULL;
const char *message = NULL; const char *message = NULL;
char *into_name = NULL; char *into_name = NULL;
int shortlog_len = -1; int shortlog_len = -1;
int merge_log_config = -1;
struct option options[] = { struct option options[] = {
{ {
.type = OPTION_INTEGER, .type = OPTION_INTEGER,
@@ -53,7 +53,7 @@ int cmd_fmt_merge_msg(int argc,
int ret; int ret;
struct fmt_merge_msg_opts opts; struct fmt_merge_msg_opts opts;
repo_config(the_repository, fmt_merge_msg_config, NULL); repo_config(repo, fmt_merge_msg_config, &merge_log_config);
argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage, argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,
0); 0);
if (argc > 0) if (argc > 0)

3
builtin/merge.c
View File

@@ -1374,6 +1374,7 @@ int cmd_merge(int argc,
struct commit_list *remoteheads = NULL, *p; struct commit_list *remoteheads = NULL, *p;
void *branch_to_free; void *branch_to_free;
int orig_argc = argc; int orig_argc = argc;
int merge_log_config = -1;
show_usage_with_options_if_asked(argc, argv, show_usage_with_options_if_asked(argc, argv,
builtin_merge_usage, builtin_merge_options); builtin_merge_usage, builtin_merge_options);
@@ -1392,7 +1393,7 @@ int cmd_merge(int argc,
skip_prefix(branch, "refs/heads/", &branch); skip_prefix(branch, "refs/heads/", &branch);
init_diff_ui_defaults(); init_diff_ui_defaults();
repo_config(the_repository, git_merge_config, NULL); repo_config(the_repository, git_merge_config, &merge_log_config);
if (!branch || is_null_oid(&head_oid)) if (!branch || is_null_oid(&head_oid))
head_commit = NULL; head_commit = NULL;

1
environment.c
View File

@@ -78,7 +78,6 @@ int grafts_keep_true_parents;
int core_apply_sparse_checkout; int core_apply_sparse_checkout;
int core_sparse_checkout_cone; int core_sparse_checkout_cone;
int sparse_expect_files_outside_of_patterns; int sparse_expect_files_outside_of_patterns;
int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
unsigned long pack_size_limit_cfg; unsigned long pack_size_limit_cfg;
int max_allowed_tree_depth = int max_allowed_tree_depth =

10
fmt-merge-msg.c
View File

@@ -26,13 +26,15 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
int fmt_merge_msg_config(const char *key, const char *value, int fmt_merge_msg_config(const char *key, const char *value,
const struct config_context *ctx, void *cb) const struct config_context *ctx, void *cb)
{ {
int *merge_log_config = cb;
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
int is_bool; int is_bool;
merge_log_config = git_config_bool_or_int(key, value, ctx->kvi, &is_bool); *merge_log_config = git_config_bool_or_int(key, value, ctx->kvi, &is_bool);
if (!is_bool && merge_log_config < 0) if (!is_bool && *merge_log_config < 0)
return error("%s: negative length %s", key, value); return error("%s: negative length %s", key, value);
if (is_bool && merge_log_config) if (is_bool && *merge_log_config)
merge_log_config = DEFAULT_MERGE_LOG_LEN; *merge_log_config = DEFAULT_MERGE_LOG_LEN;
} else if (!strcmp(key, "merge.branchdesc")) { } else if (!strcmp(key, "merge.branchdesc")) {
use_branch_desc = git_config_bool(key, value); use_branch_desc = git_config_bool(key, value);
} else if (!strcmp(key, "merge.suppressdest")) { } else if (!strcmp(key, "merge.suppressdest")) {

1
fmt-merge-msg.h
View File

@@ -12,7 +12,6 @@ struct fmt_merge_msg_opts {
const char *into_name; const char *into_name;
}; };
extern int merge_log_config;
int fmt_merge_msg_config(const char *key, const char *value, int fmt_merge_msg_config(const char *key, const char *value,
const struct config_context *ctx, void *cb); const struct config_context *ctx, void *cb);
int fmt_merge_msg(struct strbuf *in, struct strbuf *out, int fmt_merge_msg(struct strbuf *in, struct strbuf *out,

7
t/t1517-outside-repo.sh
View File

@@ -135,4 +135,11 @@ do
' '
done done
test_expect_success 'fmt-merge-msg does not crash with -h' '
test_expect_code 129 git fmt-merge-msg -h >usage &&
test_grep "[Uu]sage: git fmt-merge-msg " usage &&
test_expect_code 129 nongit git fmt-merge-msg -h >usage &&
test_grep "[Uu]sage: git fmt-merge-msg " usage
'
test_done test_done