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

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

From
Jiang Xin <worldhello.net@gmail.com>
Date
Jul 22, 2012, 01:26 UTC
Message-ID
<4cf7af65d3f14f61d165fa971e3784d4553d030b.1342920089.git.worldhello.net@gmail.com>
In-Reply-To
<247c407ce218c77a603eb6cf93228d94adc48f04.1342920089.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>
Signed-off-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 20c1a..cfa63 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.11.2.259.g37fc0e1
Previous: Jiang XinNext: Jiang Xin
Message 7 of 16 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 22, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 22, 2012
  3. 2/7 i18n: rebase: mark strings for translationJiang Xin, Jul 22, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 22, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 22, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 22, 2012
  7. 6/7 Remove unused and bad gettext block from git-amJiang Xin, Jul 22, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 22, 2012
  9. Junio C HamanoJul 22, 2012
  10. Junio C HamanoJul 22, 2012
  11. Junio C HamanoJul 22, 2012
  12. Jiang XinJul 23, 2012
  13. Junio C HamanoJul 23, 2012
  14. Jiang XinJul 23, 2012
  15. Nguyen Thai Ngoc DuyJul 23, 2012
  16. Jiang XinJul 23, 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.