diff options
| author | Ayush Chandekar <ayu.chandekar@gmail.com> | 2025-08-11 05:15:45 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-11 09:16:55 -0700 |
| commit | 9a49aef8dcdf899e94cddab14eacc7118c611524 (patch) | |
| tree | bb3bf998eb18f12c1ecb8780be583bd726b4c62d /builtin/merge.c | |
| parent | f9aa0eedb37eb94d9d3711ef0d565fd7cb3b6148 (diff) | |
environment: remove the global variable 'merge_log_config'
The global variable 'merge_log_config', set via the "merge.log" or
"merge.summary" settings, is only used in 'cmd_fmt_merge_msg()' and
'cmd_merge()' to adjust the 'shortlog_len' variable.
Remove 'merge_log_config' globally and localize it in
'cmd_fmt_merge_msg()' and 'cmd_merge()'. Set its value by passing it in
'fmt_merge_msg_config()' by passing its pointer to the function via the
callback parameter.
This change is part of an ongoing effort to eliminate global variables,
improve modularity and help libify the codebase.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Signed-off-by: Ayush Chandekar <ayu.chandekar@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ce90e52fe4..1c921b12f5 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1316,6 +1316,7 @@ int cmd_merge(int argc, struct commit_list *remoteheads = NULL, *p; void *branch_to_free; int orig_argc = argc; + int merge_log_config = -1; show_usage_with_options_if_asked(argc, argv, builtin_merge_usage, builtin_merge_options); @@ -1334,7 +1335,7 @@ int cmd_merge(int argc, skip_prefix(branch, "refs/heads/", &branch); init_diff_ui_defaults(); - git_config(git_merge_config, NULL); + git_config(git_merge_config, &merge_log_config); if (!branch || is_null_oid(&head_oid)) head_commit = NULL; |