Re: What's cooking in git.git (Oct 2021, #06; Mon, 25)
- From
Jeff King <peff@peff.net>
- Date
- Oct 26, 2021, 05:25 UTC
- Message-ID
- <YXeRNkO8B4TP/cau@coredump.intra.peff.net>
- In-Reply-To
- <xmqq5ytkzbt7.fsf@gitster.g>
On Mon, Oct 25, 2021 at 08:48:04PM -0700, Junio C Hamano wrote:
Show 7 quoted lines
> * ks/submodule-add-message-fix (2021-10-23) 1 commit > (merged to 'next' on 2021-10-25 at 377e759528) > + submodule--helper: fix incorrect newlines in an error message > > Message regression fix. > > Will merge to 'master'.
This commit has an extra unused parameter in the helper function. I think we'd want the patch below on top.
-- >8 -- Subject: submodule: drop unused sm_name parameter from append_fetch_remotes()
Commit c21fb4676f (submodule--helper: fix incorrect newlines in an error message, 2021-10-23) accidentally added a new, unused parameter while changing the name and signature of show_fetch_remotes() to append_fetch_remotes(). We can drop this to keep things simpler (and satisfy -Wunused-parameter).
The error is likely because c21fb4676f is fixing a problem from 8c8195e9c3 (submodule--helper: introduce add-clone subcommand, 2021-07-10). An earlier iteration of that second commit introduced the same unused parameter (though it was dropped before it finally made it to 'next'), and the fix on top accidentally carried forward the extra parameter.
Signed-off-by: Jeff King <peff@peff.net> --- If this seems familiar, it's because the fixup for the earlier commit was discussed in July:
https://lore.kernel.org/git/YPqkHs47VDFBNZ0Z@coredump.intra.peff.net/
builtin/submodule--helper.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 5224283bd1..13a098305b 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2776,7 +2776,7 @@ struct add_data { }; #define ADD_DATA_INIT { .depth = -1 } -static void append_fetch_remotes(struct strbuf *msg, const char *sm_name, const char *git_dir_path) +static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path) { struct child_process cp_remote = CHILD_PROCESS_INIT; struct strbuf sb_remote_out = STRBUF_INIT; @@ -2831,8 +2831,7 @@ static int add_submodule(const struct add_data *add_data) "locally with remote(s):\n"), add_data->sm_name); - append_fetch_remotes(&msg, add_data->sm_name, - submod_gitdir_path); + append_fetch_remotes(&msg, submod_gitdir_path); free(submod_gitdir_path); strbuf_addf(&msg, _("If you want to reuse this local git "
-- 2.33.1.1326.g74374c95d7