Skip to content

Commit c2b1a95

Browse files
jonseymourgitster
authored andcommitted
pull: take advantage of eval_gettextln
Signed-off-by: Jon Seymour <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent de88c1c commit c2b1a95

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

git-pull.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,9 @@ then
217217
# $orig_head commit, but we are merging into $curr_head.
218218
# First update the working tree to match $curr_head.
219219

220-
(
221-
eval_gettext "Warning: fetch updated the current branch head.
220+
eval_gettextln "Warning: fetch updated the current branch head.
222221
Warning: fast-forwarding your working tree from
223-
Warning: commit \$orig_head." &&
224-
echo
225-
) >&2
222+
Warning: commit \$orig_head." >&2
226223
git update-index -q --refresh
227224
git read-tree -u -m "$orig_head" "$curr_head" ||
228225
die "$(eval_gettext "Cannot fast-forward your working tree.

0 commit comments

Comments
 (0)