i18n: git-pull eval_gettext + warning 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
3320a973fee4a238e684d0203b0f2d4b941a2c2b
1 file changed
+6
-3
git-pull.sh
+6
-3
@@ -217,9 +217,12 @@ then
217
# $orig_head commit, but we are merging into $curr_head.
218
# First update the working tree to match $curr_head.
219
220
- echo >&2 "Warning: fetch updated the current branch head."
221
- echo >&2 "Warning: fast-forwarding your working tree from"
222
- echo >&2 "Warning: commit $orig_head."
220
+ (
221
+ eval_gettext "Warning: fetch updated the current branch head.
222
+Warning: fast-forwarding your working tree from
223
+Warning: commit \$orig_head." &&
224
+ echo
225
+ ) >&2
226
git update-index -q --refresh
227
git read-tree -u -m "$orig_head" "$curr_head" ||
228
die "$(eval_gettext "Cannot fast-forward your working tree.