From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Ayush Chandekar <ayu.chandekar@gmail.com>,
christian.couder@gmail.com, git@vger.kernel.org,
shyamthakkar001@gmail.com
Subject: Re: [GSOC PATCH v2 1/2] environment: remove the global variable 'merge_log_config'
Date: Mon, 11 Aug 2025 09:13:27 -0700 [thread overview]
Message-ID: <xmqqikit3kgo.fsf@gitster.g> (raw)
In-Reply-To: <076c19ae-58fc-4823-9679-1d5fe6e46211@gmail.com> (Phillip Wood's message of "Mon, 11 Aug 2025 15:42:48 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Ayush
>
> On 11/08/2025 00:45, Ayush Chandekar wrote:
>> 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 looks like a good solution
When fmt_merge_msg_config() needs to read more stuff, the callback
parameter may have to be updated, but this will do for now.
Thanks.
next prev parent reply other threads:[~2025-08-11 16:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 16:19 [GSOC PATCH 0/2] builtin/fmt-merge-msg: remove dependency on global variables and 'the_repository' Ayush Chandekar
2025-07-29 16:19 ` [GSOC PATCH 1/2] environment: remove the global variable 'merge_log_config' Ayush Chandekar
2025-07-29 16:48 ` Junio C Hamano
2025-07-29 17:30 ` Ayush Chandekar
2025-07-29 17:53 ` Junio C Hamano
2025-07-29 19:07 ` Phillip Wood
2025-07-29 21:16 ` Ayush Chandekar
2025-07-30 8:53 ` Phillip Wood
2025-07-29 16:19 ` [GSOC PATCH 2/2] builtin/fmt-merge-msg: stop depending on 'the_repository' Ayush Chandekar
2025-07-29 16:41 ` Junio C Hamano
2025-07-29 21:49 ` Ayush Chandekar
2025-07-29 22:41 ` Junio C Hamano
2025-08-10 15:33 ` [GSOC PATCH 0/2] builtin/fmt-merge-msg: remove dependency on global variables and 'the_repository' Ayush Chandekar
2025-08-10 23:45 ` [GSOC PATCH v2 " Ayush Chandekar
2025-08-10 23:45 ` [GSOC PATCH v2 1/2] environment: remove the global variable 'merge_log_config' Ayush Chandekar
2025-08-11 14:42 ` Phillip Wood
2025-08-11 16:13 ` Junio C Hamano [this message]
2025-08-11 18:25 ` Ayush Chandekar
2025-08-10 23:45 ` [GSOC PATCH v2 2/2] builtin/fmt-merge-msg: stop depending on 'the_repository' Ayush Chandekar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqikit3kgo.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ayu.chandekar@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=shyamthakkar001@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).