summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:18 (GMT)
commit52d77af463ce7be79f777ec7c8bf8adc632a0be2 (patch)
tree20b56baebde2314331b4704d22ae223ed69293af /builtin
parent34130cc06b478d824cc428c33796f620dd0c7424 (diff)
parent9af7ec30cbd4b4ce9e071cd0d54297101f98b426 (diff)
downloadgit-52d77af463ce7be79f777ec7c8bf8adc632a0be2.zip
git-52d77af463ce7be79f777ec7c8bf8adc632a0be2.tar.gz
git-52d77af463ce7be79f777ec7c8bf8adc632a0be2.tar.bz2
Merge branch 'bw/submodule-is-active'
Error message fix. * bw/submodule-is-active: submodule--helper: fix typo in is_active error message
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 6ee9622..36e4231 100644
--- 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();