diff options
| author |  Jeff King <peff@peff.net> | 2021-10-26 01:25:10 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-10-27 10:42:11 -0700 |
| commit | 6b615dbeced33c67d42d3a5062207b8495ecf2a8 (patch) | |
| tree | cb22cdf83cf7acd0cc926b06914b1348639a059f | |
| parent | submodule--helper: fix incorrect newlines in an error message (diff) | |
| download | tgif-6b615dbeced33c67d42d3a5062207b8495ecf2a8.tar.xz | |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/submodule--helper.c | 5 |
1 files 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 " |