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 /environment.c | |
| parent | f9aa0eedb37eb94d9d3711ef0d565fd7cb3b6148 (diff) | |
| download | git-9a49aef8dcdf899e94cddab14eacc7118c611524.tar.xz | |
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 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/environment.c b/environment.c index c61d773e7e..2babf53aa3 100644 --- a/environment.c +++ b/environment.c @@ -67,7 +67,6 @@ int grafts_keep_true_parents; int core_apply_sparse_checkout; int core_sparse_checkout_cone; int sparse_expect_files_outside_of_patterns; -int merge_log_config = -1; int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */ unsigned long pack_size_limit_cfg; int max_allowed_tree_depth = |