[PATCH v4 6/7] Remove dead code which contains bad gettext block
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- Jul 25, 2012, 03:53 UTC
- Message-ID
- <6ab33ed2c1f637ecd2dfda411cf25b074b2d17ea.1343188013.git.worldhello.net@gmail.com>
- In-Reply-To
- <1493bd09efd0ba6e1d56500305d989047da245ec.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 argumentsIndead, 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