From: Junio C Hamano Date: Wed, 28 Mar 2018 18:04:25 +0000 (-0700) Subject: Merge branch 'pc/submodule-helper' X-Git-Tag: v2.17.0-rc2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2081fa73b4d3def86eebbc80941d0bf9f34d269e?hp=-c Merge branch 'pc/submodule-helper' Hotfix. * pc/submodule-helper: submodule deinit: handle non existing pathspecs gracefully --- 2081fa73b4d3def86eebbc80941d0bf9f34d269e 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)