Merge branch 'bw/submodule-is-active'

Error message fix.

* bw/submodule-is-active:
  submodule--helper: fix typo in is_active error message
This commit is contained in:
Junio C Hamano 2017-04-19 21:37:18 -07:00
commit 52d77af463

View file

@ -1189,7 +1189,7 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
static int is_active(int argc, const char **argv, const char *prefix)
{
if (argc != 2)
die("submodule--helper is-active takes exactly 1 arguments");
die("submodule--helper is-active takes exactly 1 argument");
gitmodules_config();