From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Apr 2017 04:37:18 +0000 (-0700)
Subject: Merge branch 'bw/submodule-is-active'
X-Git-Tag: v2.13.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52d77af463ce7be79f777ec7c8bf8adc632a0be2?hp=34130cc06b478d824cc428c33796f620dd0c7424

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 6ee962207c..36e4231821 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();