summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 12:11:06 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-17 12:11:08 -0700
commitcfc3e0ee4a01873b50c080560c519762491cd60a (patch)
tree4e99f4e7f69c7d005146c82b19925acd3ff963f4
parent02dad2673b2bea4d28ca1b79c2e40fb8ad170959 (diff)
parentb80fa842ed5029853f7f1fb6bdc9171257b1db55 (diff)
downloadgit-cfc3e0ee4a01873b50c080560c519762491cd60a.tar.gz
Merge branch 'ah/submodule-typofix-in-error' into maint
Error string fix. * ah/submodule-typofix-in-error: git-submodule: remove extraneous space from error message
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 36797c3c00..25b1ddf252 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -904,7 +904,7 @@ Maybe you want to use 'update --init'?")"
;;
!*)
command="${update_module#!}"
- die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")"
+ die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")"
say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")"
must_die_on_failure=yes
;;