From: Atharva Raykar <raykar.ath@gmail.com>
To: Jeff King <peff@peff.net>
Cc: "Git List" <git@vger.kernel.org>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Shourya Shukla" <periperidip@gmail.com>,
"Kaartic Sivaraam" <kaartic.sivaraam@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Prathamesh Chavan" <pc44800@gmail.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Rafael Silva" <rafaeloliveira.cs@gmail.com>
Subject: Re: [PATCH] submodule: drop unused sm_name parameter from show_fetch_remotes()
Date: Fri, 23 Jul 2021 22:42:19 +0530 [thread overview]
Message-ID: <E30F287A-0E19-45CD-8CA7-1FDA4DF20C61@gmail.com> (raw)
In-Reply-To: <YPqkHs47VDFBNZ0Z@coredump.intra.peff.net>
On 23-Jul-2021, at 16:42, Jeff King <peff@peff.net> wrote:
>
> On Sat, Jul 10, 2021 at 01:18:01PM +0530, Atharva Raykar wrote:
>
>> +static void show_fetch_remotes(FILE *output, const char *sm_name, const char *git_dir_path)
>> +{
>> + struct child_process cp_remote = CHILD_PROCESS_INIT;
>> + struct strbuf sb_remote_out = STRBUF_INIT;
>> +
>> + cp_remote.git_cmd = 1;
>> + strvec_pushf(&cp_remote.env_array,
>> + "GIT_DIR=%s", git_dir_path);
>> + strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=.");
>> + strvec_pushl(&cp_remote.args, "remote", "-v", NULL);
>> + if (!capture_command(&cp_remote, &sb_remote_out, 0)) {
>> + char *next_line;
>> + char *line = sb_remote_out.buf;
>> + while ((next_line = strchr(line, '\n')) != NULL) {
>> + size_t len = next_line - line;
>> + if (strip_suffix_mem(line, &len, " (fetch)"))
>> + fprintf(output, " %.*s\n", (int)len, line);
>> + line = next_line + 1;
>> + }
>> + }
>> +
>> + strbuf_release(&sb_remote_out);
>> +}
>
> The sm_name parameter is not used here. I don't think it's a bug; we
> just don't need it (there's a message that mentions the name, but it
> happens right before we call the function). Maybe this should go on top
> of ar/submodule-add?
>
> -- >8 --
> Subject: submodule: drop unused sm_name parameter from show_fetch_remotes()
>
> This parameter has not been used since the function was introduced in
> 8c8195e9c3 (submodule--helper: introduce add-clone subcommand,
> 2021-07-10).
>
> Signed-off-by: Jeff King <peff@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 ed4a50c78e..1e65ff599e 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -2782,7 +2782,7 @@ struct add_data {
> };
> #define ADD_DATA_INIT { .depth = -1 }
>
> -static void show_fetch_remotes(FILE *output, const char *sm_name, const char *git_dir_path)
> +static void show_fetch_remotes(FILE *output, const char *git_dir_path)
> {
> struct child_process cp_remote = CHILD_PROCESS_INIT;
> struct strbuf sb_remote_out = STRBUF_INIT;
> @@ -2833,8 +2833,7 @@ static int add_submodule(const struct add_data *add_data)
> fprintf(stderr, _("A git directory for '%s' is found "
> "locally with remote(s):"),
> add_data->sm_name);
> - show_fetch_remotes(stderr, add_data->sm_name,
> - submod_gitdir_path);
> + show_fetch_remotes(stderr, submod_gitdir_path);
> free(submod_gitdir_path);
> die(_("If you want to reuse this local git "
> "directory instead of cloning again from\n"
> --
> 2.32.0.784.g92e169d3d7
>
Yes, this is definitely an oversight on my part, and it looks like this
topic has already made it to 'next'.
Thanks for the fix.
next prev parent reply other threads:[~2021-07-23 17:12 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 18:19 [GSoC] [PATCH 0/3] submodule add: partial conversion to C Atharva Raykar
2021-07-06 18:19 ` [GSoC] [PATCH 1/3] t7400: test failure to add submodule in tracked path Atharva Raykar
2021-07-06 18:19 ` [GSoC] [PATCH 2/3] submodule--helper: refactor module_clone() Atharva Raykar
2021-07-06 18:19 ` [GSoC] [PATCH 3/3] submodule--helper: introduce add-clone subcommand Atharva Raykar
2021-07-07 19:57 ` Junio C Hamano
2021-07-08 6:45 ` Atharva Raykar
2021-07-08 9:55 ` [GSoC] [PATCH v2 0/4] submodule add: partial conversion to C Atharva Raykar
2021-07-08 9:55 ` [GSoC] [PATCH v2 1/4] t7400: test failure to add submodule in tracked path Atharva Raykar
2021-07-08 9:55 ` [GSoC] [PATCH v2 2/4] submodule: prefix die messages with 'fatal' Atharva Raykar
2021-07-08 15:17 ` Junio C Hamano
2021-07-09 14:52 ` Đoàn Trần Công Danh
2021-07-10 7:52 ` Atharva Raykar
2021-07-10 12:04 ` Kaartic Sivaraam
2021-07-08 9:55 ` [GSoC] [PATCH v2 3/4] submodule--helper: refactor module_clone() Atharva Raykar
2021-07-08 9:55 ` [GSoC] [PATCH v2 4/4] submodule--helper: introduce add-clone subcommand Atharva Raykar
2021-07-10 7:47 ` [GSoC] [PATCH v3 0/4] submodule add: partial conversion to C Atharva Raykar
2021-07-10 7:47 ` [GSoC] [PATCH v3 1/4] t7400: test failure to add submodule in tracked path Atharva Raykar
2021-07-10 7:47 ` [GSoC] [PATCH v3 2/4] submodule: prefix die messages with 'fatal' Atharva Raykar
2021-07-10 7:48 ` [GSoC] [PATCH v3 3/4] submodule--helper: refactor module_clone() Atharva Raykar
2021-07-10 7:48 ` [GSoC] [PATCH v3 4/4] submodule--helper: introduce add-clone subcommand Atharva Raykar
2021-07-23 11:12 ` [PATCH] submodule: drop unused sm_name parameter from show_fetch_remotes() Jeff King
2021-07-23 17:12 ` Atharva Raykar [this message]
2021-07-26 19:03 ` Junio C Hamano
2021-08-05 19:28 ` [PATCH] submodule--helper: fix incorrect newlines in an error message Kaartic Sivaraam
2021-08-06 6:29 ` Atharva Raykar
2021-08-06 19:07 ` Kaartic Sivaraam
2021-09-18 19:31 ` [PATCH v2 0/1] submodule: corret an incorrectly formatted " Kaartic Sivaraam
2021-09-18 19:31 ` [PATCH v2 1/1] submodule--helper: fix incorrect newlines in an " Kaartic Sivaraam
2021-09-20 18:09 ` Junio C Hamano
2021-09-21 16:52 ` Atharva Raykar
2021-09-21 16:47 ` Atharva Raykar
2021-10-23 12:57 ` [PATCH v3 0/1] submodule: correct an incorrectly formatted " Kaartic Sivaraam
2021-10-23 12:57 ` [PATCH v3 1/1] submodule--helper: fix incorrect newlines in an " Kaartic Sivaraam
2021-10-24 6:05 ` [PATCH v3 0/1] submodule: correct an incorrectly formatted " Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E30F287A-0E19-45CD-8CA7-1FDA4DF20C61@gmail.com \
--to=raykar.ath@gmail.com \
--cc=christian.couder@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=pc44800@gmail.com \
--cc=peff@peff.net \
--cc=periperidip@gmail.com \
--cc=rafaeloliveira.cs@gmail.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).