summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-07-25 14:53:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-27 05:34:15 (GMT)
commit31023e0a9fdba7ed6458caf2082dd6d82df6a56c (patch)
tree25f57ec0e4485c31226cfef5f7eab788f0cdaf99 /git-am.sh
parent42e6504f5e1366aeda4fdcd466a2e8bc7a75235e (diff)
downloadgit-31023e0a9fdba7ed6458caf2082dd6d82df6a56c.zip
git-31023e0a9fdba7ed6458caf2082dd6d82df6a56c.tar.gz
git-31023e0a9fdba7ed6458caf2082dd6d82df6a56c.tar.bz2
Remove dead code which contains bad gettext block
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 Jonathan 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index 4598d86..a1f3f30 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)