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

[PATCH v3 6/7] Remove unused and bad gettext block from git-am

From
Jiang Xin <worldhello.net@gmail.com>
Date
Jul 24, 2012, 06:59 UTC
Message-ID
<dc805486adc18bf70cea73f9c6363bb3c4cf6c2b.1343112786.git.worldhello.net@gmail.com>
In-Reply-To
<d3711733085d683d9a63cff6f615ef3114f2d3c0.1343112786.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>
Reviewed-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 b7183..a2e3d 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.17.gcb766d3
Previous: Jiang XinNext: Jiang Xin
Message 7 of 28 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 24, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 24, 2012
  3. 2/7 i18n: rebase: mark strings for translationJiang Xin, Jul 24, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 24, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 24, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 24, 2012
  7. 6/7 Remove unused and bad gettext block from git-amJiang Xin, Jul 24, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 24, 2012
  9. Stefano LattariniJul 24, 2012
  10. Jonathan NiederJul 24, 2012
  11. Junio C HamanoJul 24, 2012
  12. Martin von ZweigbergkJul 24, 2012
  13. Junio C HamanoJul 24, 2012
  14. Jonathan NiederJul 24, 2012
  15. Junio C HamanoJul 24, 2012
  16. Jonathan NiederJul 24, 2012
  17. Junio C HamanoJul 24, 2012
  18. Thomas RastJul 25, 2012
  19. Jiang XinJul 24, 2012
  20. Jonathan NiederJul 24, 2012
  21. Junio C HamanoJul 24, 2012
  22. Stefano LattariniJul 24, 2012
  23. Stefano LattariniJul 24, 2012
  24. Jonathan NiederJul 24, 2012
  25. Junio C HamanoJul 24, 2012
  26. Jiang XinJul 24, 2012
  27. Stefano LattariniJul 24, 2012
  28. Jonathan NiederJul 24, 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.