i18n: submodule: escape shell variables inside eval_gettext
According to the gettext manual [1], references to shell variables inside eval_gettext call must be escaped so that eval_gettext receives the translatable string before the variable values are substituted into it. [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 21:54 UTC
c87302bfe4ca0a861004eaa5e67f011446afea74
1 file changed
+2
-2
git-submodule.sh
+2
-2
@@ -647,7 +647,7 @@ cmd_update()
647
remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
648
sha1=$(sanitize_submodule_env; cd "$sm_path" &&
649
git rev-parse --verify "${remote_name}/${branch}") ||
650
- die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
650
+ die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
651
fi
652
653
if test "$subsha1" != "$sha1" || test -n "$force"
@@ -671,7 +671,7 @@ cmd_update()
671
# not be reachable from any of the refs
672
is_tip_reachable "$sm_path" "$sha1" ||
673
fetch_in_submodule "$sm_path" "$sha1" ||
674
- die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
674
+ die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
675
fi
676
677
must_die_on_failure=