development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ks/submodule-add-message-fix'

Browse source 
Message regression fix.

* ks/submodule-add-message-fix:
  submodule: drop unused sm_name parameter from append_fetch_remotes()
  submodule--helper: fix incorrect newlines in an error message
This commit is contained in:
Junio C Hamano 2021-10-29 15:43:14 -07:00
parent dacf0acdf6 6b615dbece
commit f54c172bb3
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
builtin/submodule--helper.c
View file

@ -2999,7 +2999,7 @@ struct add_data {
}; };
#define ADD_DATA_INIT { .depth = -1 } #define ADD_DATA_INIT { .depth = -1 }
static void show_fetch_remotes(FILE *output, 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 child_process cp_remote = CHILD_PROCESS_INIT;
struct strbuf sb_remote_out = STRBUF_INIT; struct strbuf sb_remote_out = STRBUF_INIT;
@ -3015,7 +3015,7 @@ static void show_fetch_remotes(FILE *output, const char *git_dir_path)
while ((next_line = strchr(line, '\n')) != NULL) { while ((next_line = strchr(line, '\n')) != NULL) {
size_t len = next_line - line; size_t len = next_line - line;
if (strip_suffix_mem(line, &len, " (fetch)")) if (strip_suffix_mem(line, &len, " (fetch)"))
fprintf(output, " %.*s\n", (int)len, line); strbuf_addf(msg, " %.*s\n", (int)len, line);
line = next_line + 1; line = next_line + 1;
} }
} }
@ -3047,19 +3047,27 @@ static int add_submodule(const struct add_data *add_data)
if (is_directory(submod_gitdir_path)) { if (is_directory(submod_gitdir_path)) {
if (!add_data->force) { if (!add_data->force) {
fprintf(stderr, _("A git directory for '%s' is found " struct strbuf msg = STRBUF_INIT;
"locally with remote(s):"), char *die_msg;
add_data->sm_name);
show_fetch_remotes(stderr, submod_gitdir_path); strbuf_addf(&msg, _("A git directory for '%s' is found "
"locally with remote(s):\n"),
add_data->sm_name);
append_fetch_remotes(&msg, submod_gitdir_path);
free(submod_gitdir_path); free(submod_gitdir_path);
die(_("If you want to reuse this local git "
"directory instead of cloning again from\n" strbuf_addf(&msg, _("If you want to reuse this local git "
" %s\n" "directory instead of cloning again from\n"
"use the '--force' option. If the local git " " %s\n"
"directory is not the correct repo\n" "use the '--force' option. If the local git "
"or if you are unsure what this means, choose " "directory is not the correct repo\n"
"another name with the '--name' option.\n"), "or you are unsure what this means choose "
add_data->realrepo); "another name with the '--name' option."),
add_data->realrepo);
die_msg = strbuf_detach(&msg, NULL);
die("%s", die_msg);
} else { } else {
printf(_("Reactivating local git directory for " printf(_("Reactivating local git directory for "
"submodule '%s'\n"), add_data->sm_name); "submodule '%s'\n"), add_data->sm_name);