git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] submodule: drop unused sm_name parameter from show_fetch_remotes()

From
Atharva Raykar <raykar.ath@gmail.com>
Date
Jul 23, 2021, 17:12 UTC
Message-ID
<E30F287A-0E19-45CD-8CA7-1FDA4DF20C61@gmail.com>
In-Reply-To
<YPqkHs47VDFBNZ0Z@coredump.intra.peff.net>
On 23-Jul-2021, at 16:42, Jeff King <peff@peff.net> wrote:
Show 70 quoted lines
> 
> 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.
Previous: Jeff KingNext: Junio C Hamano
Message 22 of 34 in “submodule add: partial conversion to C”
  1. Atharva RaykarJul 6, 2021
  2. [GSoC] [PATCH 1/3] t7400: test failure to add submodule in tracked pathAtharva Raykar, Jul 6, 2021
  3. [GSoC] [PATCH 2/3] submodule--helper: refactor module_clone()Atharva Raykar, Jul 6, 2021
  4. [GSoC] [PATCH 3/3] submodule--helper: introduce add-clone subcommandAtharva Raykar, Jul 6, 2021
  5. Junio C HamanoJul 7, 2021
  6. Atharva RaykarJul 8, 2021
  7. [GSoC] [PATCH v2 0/4] submodule add: partial conversion to CAtharva Raykar, Jul 8, 2021
  8. [GSoC] [PATCH v2 1/4] t7400: test failure to add submodule in tracked pathAtharva Raykar, Jul 8, 2021
  9. [GSoC] [PATCH v2 2/4] submodule: prefix die messages with 'fatal'Atharva Raykar, Jul 8, 2021
  10. Junio C HamanoJul 8, 2021
  11. Đoàn Trần Công DanhJul 9, 2021
  12. Atharva RaykarJul 10, 2021
  13. Kaartic SivaraamJul 10, 2021
  14. [GSoC] [PATCH v2 3/4] submodule--helper: refactor module_clone()Atharva Raykar, Jul 8, 2021
  15. [GSoC] [PATCH v2 4/4] submodule--helper: introduce add-clone subcommandAtharva Raykar, Jul 8, 2021
  16. [GSoC] [PATCH v3 0/4] submodule add: partial conversion to CAtharva Raykar, Jul 10, 2021
  17. [GSoC] [PATCH v3 1/4] t7400: test failure to add submodule in tracked pathAtharva Raykar, Jul 10, 2021
  18. [GSoC] [PATCH v3 2/4] submodule: prefix die messages with 'fatal'Atharva Raykar, Jul 10, 2021
  19. [GSoC] [PATCH v3 3/4] submodule--helper: refactor module_clone()Atharva Raykar, Jul 10, 2021
  20. [GSoC] [PATCH v3 4/4] submodule--helper: introduce add-clone subcommandAtharva Raykar, Jul 10, 2021
  21. submodule: drop unused sm_name parameter from show_fetch_remotes()Jeff King, Jul 23, 2021
  22. Atharva RaykarJul 23, 2021
  23. Junio C HamanoJul 26, 2021
  24. submodule--helper: fix incorrect newlines in an error messageKaartic Sivaraam, Aug 5, 2021
  25. Atharva RaykarAug 6, 2021
  26. Kaartic SivaraamAug 6, 2021
  27. 0/1 submodule: corret an incorrectly formatted error messageKaartic Sivaraam, Sep 18, 2021
  28. 1/1 submodule--helper: fix incorrect newlines in an error messageKaartic Sivaraam, Sep 18, 2021
  29. Junio C HamanoSep 20, 2021
  30. Atharva RaykarSep 21, 2021
  31. Atharva RaykarSep 21, 2021
  32. 0/1 submodule: correct an incorrectly formatted error messageKaartic Sivaraam, Oct 23, 2021
  33. 1/1 submodule--helper: fix incorrect newlines in an error messageKaartic Sivaraam, Oct 23, 2021
  34. Junio C HamanoOct 24, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.