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>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Stefano Lattarini" <stefano.lattarini@gmail.com>,
"Martin von Zweigbergk" <martin.von.zweigbergk@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH v4 6/7] Remove dead code which contains bad gettext block
Date: Wed, 25 Jul 2012 11:53:47 +0800 [thread overview]
Message-ID: <6ab33ed2c1f637ecd2dfda411cf25b074b2d17ea.1343188013.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <1493bd09efd0ba6e1d56500305d989047da245ec.1343188013.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1343188013.git.worldhello.net@gmail.com>
Found this dead code when I examine gettext messages in shell scripts
start with dash ('-' or '--'). An error will be raised for this case,
like:
$ gettext "-d option is no longer supported. Do not use."
gettext: missing arguments
Indead, this code has been left as dead for a long time, as Junathan
points out:
The git am -d/--dotest option has errored out with a message
since e72c7406 (am: remove support for -d .dotest, 2008-03-04).
The error message about lack of support was eliminated along
with other cleanups (probably by mistake) a year later by
removing the option from the option table in 98ef23b3 (git-am:
minor cleanups, 2009-01-28).
But the code to handle -d and --dotest stayed around even though
ever since then it could not be tripped. Remove this dead code.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
git-am.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 3f654..c81a2 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.12.rc0.16.gf4916ac
next prev parent reply other threads:[~2012-07-25 3:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 3:53 [PATCH v4 0/7] i18n for git-am, git-rebase and git-merge Jiang Xin
2012-07-25 3:53 ` [PATCH v4 1/7] i18n: New keywords for xgettext extraction from sh Jiang Xin
2012-07-25 3:53 ` [PATCH v4 2/7] i18n: rebase: mark strings for translation Jiang Xin
2012-07-25 3:53 ` [PATCH v4 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-25 3:53 ` [PATCH v4 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jiang Xin
2012-07-25 3:53 ` [PATCH v4 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-25 3:53 ` Jiang Xin [this message]
2012-07-25 3:53 ` [PATCH v4 7/7] i18n: merge-recursive: mark " Jiang Xin
2012-07-25 4:30 ` [PATCH v4 6/7] Remove dead code which contains bad gettext block Jonathan Nieder
2012-07-25 4:26 ` [PATCH v4 5/7] i18n: am: mark more strings for translation Jonathan Nieder
2012-07-25 9:59 ` Stefano Lattarini
2012-07-25 11:01 ` Jiang Xin
2012-07-25 4:21 ` [PATCH v4 2/7] i18n: rebase: mark " Jonathan Nieder
2012-07-25 7:32 ` Jiang Xin
2012-07-25 9:56 ` Jonathan Nieder
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=6ab33ed2c1f637ecd2dfda411cf25b074b2d17ea.1343188013.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=martin.von.zweigbergk@gmail.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).