Merge branch 'bw/submodule-is-active'

Error message fix.

* bw/submodule-is-active:
submodule--helper: fix typo in is_active error message

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6ee962207c4e38f3135f26ff8e0fdca98fa81fa1..36e4231821c0acbb6fe21948c752d4ee7c96405d 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -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();