[PATCH v2 3/5] pull: take advantage of eval_gettextln
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
git-pull.sh | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index a10b129..d3ffd8f 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.
--
1.7.6.363.g9b380.dirty
Jon Seymour <jon.seymour@gmail.com>