Skip to content

Commit

Permalink
pull: take advantage of eval_gettextln
Browse files Browse the repository at this point in the history
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jon Seymour authored and Junio C Hamano committed Aug 8, 2011
1 parent de88c1c commit c2b1a95
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,9 @@ then
# $orig_head commit, but we are merging into $curr_head.
# First update the working tree to match $curr_head.

(
eval_gettext "Warning: fetch updated the current branch head.
eval_gettextln "Warning: fetch updated the current branch head.
Warning: fast-forwarding your working tree from
Warning: commit \$orig_head." &&
echo
) >&2
Warning: commit \$orig_head." >&2
git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" ||
die "$(eval_gettext "Cannot fast-forward your working tree.
Expand Down

0 comments on commit c2b1a95

Please sign in to comment.