From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Mar 2018 06:08:51 +0000 (-0700)
Subject: Merge branch 'pc/submodule-helper' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/362e0ef09b3a3b1c3e09b7df3c8468756831e80e?hp=-c

Merge branch 'pc/submodule-helper' into next

Rewrite two more "git submodule" subcommands in C.

* pc/submodule-helper:
submodule deinit: handle non existing pathspecs gracefully
---

362e0ef09b3a3b1c3e09b7df3c8468756831e80e
diff --combined builtin/submodule--helper.c
index ee020d4749,b5d3713798..6ba8587b6d
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -1019,7 -1019,7 +1019,7 @@@ static int module_deinit(int argc, cons
  
  	struct option module_deinit_options[] = {
  		OPT__QUIET(&quiet, N_("Suppress submodule status output")),
 -		OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes")),
 +		OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes"), 0),
  		OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
  		OPT_END()
  	};
@@@ -1042,7 -1042,7 +1042,7 @@@
  		die(_("Use '--all' if you really want to deinitialize all submodules"));
  
  	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
- 		BUG("module_list_compute should not choke on empty pathspec");
+ 		return 1;
  
  	info.prefix = prefix;
  	if (quiet)