From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 13 Sep 2010 18:47:44 +0000 (+0000)
Subject: gettextize: git-pull eval_gettext + die message
X-Git-Tag: ko-pu~10^2~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=872f50138e8eb85c6a22323d9945beccdd9686d0;p=git.git

gettextize: git-pull eval_gettext + die message

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---

diff --git a/git-pull.sh b/git-pull.sh
index 324ac9526..8c0ea23ac 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -238,12 +238,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