]> git.ipfire.org Git - thirdparty/git.git/commit
environment: remove the global variable 'merge_log_config'
authorAyush Chandekar <ayu.chandekar@gmail.com>
Sun, 10 Aug 2025 23:45:45 +0000 (05:15 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2025 16:16:55 +0000 (09:16 -0700)
commit9a49aef8dcdf899e94cddab14eacc7118c611524
treebb3bf998eb18f12c1ecb8780be583bd726b4c62d
parentf9aa0eedb37eb94d9d3711ef0d565fd7cb3b6148
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>
builtin/fmt-merge-msg.c
builtin/merge.c
environment.c
fmt-merge-msg.c
fmt-merge-msg.h