summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-28 18:04:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-28 18:04:25 (GMT)
commit2081fa73b4d3def86eebbc80941d0bf9f34d269e (patch)
tree5fba071d0c6132fe2a76355c762cbef00258d34c /builtin
parent87cc76fa3a79eb86136e55432bd4e4ecc84744cd (diff)
parent9748e39d0c17a79e67d2728199515cf40e2850dc (diff)
downloadgit-2081fa73b4d3def86eebbc80941d0bf9f34d269e.zip
git-2081fa73b4d3def86eebbc80941d0bf9f34d269e.tar.gz
git-2081fa73b4d3def86eebbc80941d0bf9f34d269e.tar.bz2
Merge branch 'pc/submodule-helper'
Hotfix. * pc/submodule-helper: submodule deinit: handle non existing pathspecs gracefully
Diffstat (limited to 'builtin')
-rw-r--r--builtin/submodule--helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index ee020d4..6ba8587 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1042,7 +1042,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
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)