From: Junio C Hamano Date: Thu, 17 Sep 2015 19:11:06 +0000 (-0700) Subject: Merge branch 'ah/submodule-typofix-in-error' into maint X-Git-Tag: v2.5.3~3 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/cfc3e0ee4a01873b50c080560c519762491cd60a?hp=02dad2673b2bea4d28ca1b79c2e40fb8ad170959 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 --- 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 ;;