pull: take advantage of eval_gettextln

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-pull.sh b/git-pull.sh
index a10b1290bc9218942fcec54b9e930f072ca11bce..d3ffd8fc6eab115988884b1ea3e4c22a1e45e802 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -217,12 +217,9 @@ then
        # $orig_head commit, but we are merging into $curr_head.
        # First update the working tree to match $curr_head.
 
        # $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: 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.
        git update-index -q --refresh
        git read-tree -u -m "$orig_head" "$curr_head" ||
                die "$(eval_gettext "Cannot fast-forward your working tree.