From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:27 +0000 (+0900)
Subject: Merge branch 'nd/submodule-helper-incomplete-line-fix'
X-Git-Tag: v2.22.0-rc1~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/195d7999554b3f03c5e5ebebdac60059c1d40288?ds=inline;hp=-c

Merge branch 'nd/submodule-helper-incomplete-line-fix'

Typofix.

* nd/submodule-helper-incomplete-line-fix:
submodule--helper: add a missing \n
---

195d7999554b3f03c5e5ebebdac60059c1d40288
diff --combined builtin/submodule--helper.c
index 8c72ea864c,163a6b8b99..0bf4aa088e
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -348,7 -348,7 +348,7 @@@ static int module_list_compute(int argc
  			i++;
  	}
  
 -	if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
 +	if (ps_matched && report_path_error(ps_matched, pathspec))
  		result = -1;
  
  	free(ps_matched);
@@@ -566,12 -566,12 +566,12 @@@ static int module_foreach(int argc, con
  	};
  
  	const char *const git_submodule_helper_usage[] = {
 -		N_("git submodule--helper foreach [--quiet] [--recursive] <command>"),
 +		N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"),
  		NULL
  	};
  
  	argc = parse_options(argc, argv, prefix, module_foreach_options,
 -			     git_submodule_helper_usage, PARSE_OPT_KEEP_UNKNOWN);
 +			     git_submodule_helper_usage, 0);
  
  	if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0)
  		return 1;
@@@ -709,7 -709,7 +709,7 @@@ static int module_init(int argc, const 
  	};
  
  	const char *const git_submodule_helper_usage[] = {
 -		N_("git submodule--helper init [<path>]"),
 +		N_("git submodule--helper init [<options>] [<path>]"),
  		NULL
  	};
  
@@@ -1301,7 -1301,7 +1301,7 @@@ static int add_possible_reference_from_
  				die(_("submodule '%s' cannot add alternate: %s"),
  				    sas->submodule_name, err.buf);
  			case SUBMODULE_ALTERNATE_ERROR_INFO:
- 				fprintf(stderr, _("submodule '%s' cannot add alternate: %s"),
+ 				fprintf_ln(stderr, _("submodule '%s' cannot add alternate: %s"),
  					sas->submodule_name, err.buf);
  			case SUBMODULE_ALTERNATE_ERROR_IGNORE:
  				; /* nothing */
@@@ -1816,10 -1816,11 +1816,10 @@@ static int update_submodules(struct sub
  {
  	int i;
  
 -	run_processes_parallel(suc->max_jobs,
 -			       update_clone_get_next_task,
 -			       update_clone_start_failure,
 -			       update_clone_task_finished,
 -			       suc);
 +	run_processes_parallel_tr2(suc->max_jobs, update_clone_get_next_task,
 +				   update_clone_start_failure,
 +				   update_clone_task_finished, suc, "submodule",
 +				   "parallel/update");
  
  	/*
  	 * We saved the output and put it out all at once now.
@@@ -2096,7 -2097,7 +2096,7 @@@ static int absorb_git_dirs(int argc, co
  	};
  
  	const char *const git_submodule_helper_usage[] = {
 -		N_("git submodule--helper embed-git-dir [<path>...]"),
 +		N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
  		NULL
  	};
  
@@@ -2147,22 -2148,17 +2147,22 @@@ static int check_name(int argc, const c
  static int module_config(int argc, const char **argv, const char *prefix)
  {
  	enum {
 -		CHECK_WRITEABLE = 1
 +		CHECK_WRITEABLE = 1,
 +		DO_UNSET = 2
  	} command = 0;
  
  	struct option module_config_options[] = {
  		OPT_CMDMODE(0, "check-writeable", &command,
  			    N_("check if it is safe to write to the .gitmodules file"),
  			    CHECK_WRITEABLE),
 +		OPT_CMDMODE(0, "unset", &command,
 +			    N_("unset the config in the .gitmodules file"),
 +			    DO_UNSET),
  		OPT_END()
  	};
  	const char *const git_submodule_helper_usage[] = {
 -		N_("git submodule--helper config name [value]"),
 +		N_("git submodule--helper config <name> [<value>]"),
 +		N_("git submodule--helper config --unset <name>"),
  		N_("git submodule--helper config --check-writeable"),
  		NULL
  	};
@@@ -2174,17 -2170,15 +2174,17 @@@
  		return is_writing_gitmodules_ok() ? 0 : -1;
  
  	/* Equivalent to ACTION_GET in builtin/config.c */
 -	if (argc == 2)
 +	if (argc == 2 && command != DO_UNSET)
  		return print_config_from_gitmodules(the_repository, argv[1]);
  
  	/* Equivalent to ACTION_SET in builtin/config.c */
 -	if (argc == 3) {
 +	if (argc == 3 || (argc == 2 && command == DO_UNSET)) {
 +		const char *value = (argc == 3) ? argv[2] : NULL;
 +
  		if (!is_writing_gitmodules_ok())
  			die(_("please make sure that the .gitmodules file is in the working tree"));
  
 -		return config_set_in_gitmodules_file_gently(argv[1], argv[2]);
 +		return config_set_in_gitmodules_file_gently(argv[1], value);
  	}
  
  	usage_with_options(git_submodule_helper_usage, module_config_options);