From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Stefano Lattarini" <stefano.lattarini@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH v2 6/7] Remove unused and bad gettext block from git-am
Date: Sun, 22 Jul 2012 09:26:10 +0800 [thread overview]
Message-ID: <4cf7af65d3f14f61d165fa971e3784d4553d030b.1342920089.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <247c407ce218c77a603eb6cf93228d94adc48f04.1342920089.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1342920089.git.worldhello.net@gmail.com>
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
git-am.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 20c1a..cfa63 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -413,9 +413,6 @@ it will be removed. Please do not use it anymore.")
abort=t ;;
--rebasing)
rebasing=t threeway=t ;;
- -d|--dotest)
- die "$(gettext "-d option is no longer supported. Do not use.")"
- ;;
--resolvemsg)
shift; resolvemsg=$1 ;;
--whitespace|--directory|--exclude|--include)
--
1.7.11.2.259.g37fc0e1
next prev parent reply other threads:[~2012-07-22 1:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-22 1:26 [PATCH v2 0/7] i18n for git-am, git-rebase and git-merge Jiang Xin
2012-07-22 1:26 ` [PATCH v2 1/7] i18n: New keywords for xgettext extraction from sh Jiang Xin
2012-07-22 1:26 ` [PATCH v2 2/7] i18n: rebase: mark strings for translation Jiang Xin
2012-07-22 1:26 ` [PATCH v2 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-22 1:26 ` [PATCH v2 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jiang Xin
2012-07-22 1:26 ` [PATCH v2 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-22 1:26 ` Jiang Xin [this message]
2012-07-22 1:26 ` [PATCH v2 7/7] i18n: merge-recursive: mark " Jiang Xin
2012-07-22 19:37 ` Junio C Hamano
2012-07-22 19:04 ` [PATCH v2 2/7] i18n: rebase: " Junio C Hamano
2012-07-22 19:47 ` [PATCH v2 0/7] i18n for git-am, git-rebase and git-merge Junio C Hamano
2012-07-23 3:14 ` Jiang Xin
2012-07-23 4:36 ` Junio C Hamano
2012-07-23 7:32 ` Jiang Xin
2012-07-23 7:38 ` Nguyen Thai Ngoc Duy
2012-07-23 8:01 ` Jiang Xin
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=4cf7af65d3f14f61d165fa971e3784d4553d030b.1342920089.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=stefano.lattarini@gmail.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).