pull: take advantage of eval_gettextln
Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jon Seymour committed
Aug 7, 2011 at 21:58 UTC
c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6
1 file changed
+2
-5
git-pull.sh
+2
-5
@@ -217,12 +217,9 @@ then
217
# $orig_head commit, but we are merging into $curr_head.
218
# First update the working tree to match $curr_head.
219
220
- (
221
- eval_gettext "Warning: fetch updated the current branch head.
220
+ eval_gettextln "Warning: fetch updated the current branch head.
221
Warning: fast-forwarding your working tree from
223
-Warning: commit \$orig_head." &&
224
- echo
225
- ) >&2
222
+Warning: commit \$orig_head." >&2
223
git update-index -q --refresh
224
git read-tree -u -m "$orig_head" "$curr_head" ||
225
die "$(eval_gettext "Cannot fast-forward your working tree.