From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: avarab@gmail.com, Jens.Lehmann@web.de, gitster@pobox.com,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v2 3/5] pull: take advantage of eval_gettextln
Date: Sun, 7 Aug 2011 21:58:15 +1000 [thread overview]
Message-ID: <1312718297-10999-4-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312718297-10999-1-git-send-email-jon.seymour@gmail.com>
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
next prev parent reply other threads:[~2011-08-07 11:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-07 11:58 [PATCH v2 0/5] gettext: add gettextln, eval_gettextln to encode common idiom Jon Seymour
2011-08-07 11:58 ` [PATCH v2 1/5] " Jon Seymour
2011-08-07 11:58 ` [PATCH v2 2/5] git-am: take advantage of gettextln and eval_gettextln Jon Seymour
2011-08-07 11:58 ` Jon Seymour [this message]
2011-08-07 11:58 ` [PATCH v2 4/5] stash: take advantage of eval_gettextln Jon Seymour
2011-08-07 11:58 ` [PATCH v2 5/5] submodule: take advantage of gettextln and eval_gettextln Jon Seymour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312718297-10999-4-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).