From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 21 May 2011 18:43:56 +0000 (+0000)
Subject: i18n: git-pull eval_gettext + die message
X-Git-Tag: v1.7.7-rc0~116^2~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9f35aaa917455dee3d205fc28e549a3c640fb448;p=git.git

i18n: git-pull eval_gettext + die message

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-pull.sh b/git-pull.sh
index acb0c3773..06dcd81b0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -222,12 +222,12 @@ then
 	echo >&2 "Warning: commit $orig_head."
 	git update-index -q --refresh
 	git read-tree -u -m "$orig_head" "$curr_head" ||
-		die 'Cannot fast-forward your working tree.
+		die "$(eval_gettext "Cannot fast-forward your working tree.
 After making sure that you saved anything precious from
-$ git diff '$orig_head'
+$ git diff \$orig_head
 output, run
 $ git reset --hard
-to recover.'
+to recover.")"
 
 fi