Thread (12 messages) flat view 12 messages, 2 authors, 2016-06-15
DORMANTno replies

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

From: Jiang Xin <hidden>
Date: 2016-06-15 22:54:18
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
Signed-off-by: Stefano Lattarini <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help