summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Vasco Almeida <vascomalmeida@sapo.pt>2016-06-17 20:20:58 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-17 15:45:48 -0700
commit24a6df489a47dab63f24caa5cc4dcbf6740049cc (patch)
tree1e611d6ae5a553526a78bda1c5a10e158daf8aa5
parentmerge-octopus: use die shell function from git-sh-setup.sh (diff)
downloadtgif-24a6df489a47dab63f24caa5cc4dcbf6740049cc.tar.xz
i18n: rebase: fix marked string to use eval_gettext variant
The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 44ede367ae..1fadc04164 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -154,7 +154,7 @@ move_to_original_branch () {
git symbolic-ref \
-m "rebase finished: returning to $head_name" \
HEAD $head_name ||
- die "$(gettext "Could not move back to $head_name")"
+ die "$(eval_gettext "Could not move back to \$head_name")"
;;
esac
}