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>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
9f35aaa917455dee3d205fc28e549a3c640fb448
1 file changed
+3
-3
git-pull.sh
+3
-3
@@ -222,12 +222,12 @@ then
222
echo >&2 "Warning: commit $orig_head."
223
git update-index -q --refresh
224
git read-tree -u -m "$orig_head" "$curr_head" ||
225
- die 'Cannot fast-forward your working tree.
225
+ die "$(eval_gettext "Cannot fast-forward your working tree.
226
After making sure that you saved anything precious from
227
-$ git diff '$orig_head'
227
+$ git diff \$orig_head
228
output, run
229
$ git reset --hard
230
-to recover.'
230
+to recover.")"
231
232
fi
233