From: Jon Seymour <jon.seymour@gmail.com>
Date: Sun, 7 Aug 2011 11:58:15 +0000 (+1000)
Subject: pull: take advantage of eval_gettextln
X-Git-Tag: v1.7.7-rc0~9^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6;p=git.git

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 a10b1290b..d3ffd8fc6 100755
--- 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.
 
-	(
-		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.