git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 6/7] Remove dead code which contains bad gettext block

From
Jiang Xin <worldhello.net@gmail.com>
Date
Jul 25, 2012, 14:53 UTC
Message-ID
<c44188f93823a8028086d8abf5c59250b877c25c.1343227806.git.worldhello.net@gmail.com>
In-Reply-To
<7483bb4c75600ac3ffd4f740040a4256ff70821f.1343227806.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 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>
---
 git-am.sh | 3 ---
 1 file changed, 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 25d0e..bd962 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
Previous: Jiang XinNext: Jiang Xin
Message 7 of 10 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 25, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 25, 2012
  3. 2/7 i18n: rebase: mark messages for translationJiang Xin, Jul 25, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 25, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 25, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 25, 2012
  7. 6/7 Remove dead code which contains bad gettext blockJiang Xin, Jul 25, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 25, 2012
  9. Junio C HamanoJul 25, 2012
  10. Junio C HamanoJul 25, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.