[PATCH 2/2] --compress-sigs and --compress-keys are not no-ops in 2.0.x branch

[Daniel Kahn Gillmor]

* g10/gpg.c: cleanup argument parsing

--

c76117f8b0165fe5cec5e7f234f55f5a4cd7f0ab mistakenly marked
compress-sigs and compress-keys as no-ops on the 2.0.x branch.

These options still have an effect on the 2.0.x branch, and the
duplicate declaration also causes the gpg argument parser to fail when
shortened versions of the option are present, like:

  gpg: option "--compress-k" is ambiguous
---
 g10/gpg.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index eefd4ae..a995796 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -770,8 +770,6 @@ static ARGPARSE_OPTS opts[] = {
   /* Dummy options.  */
   ARGPARSE_s_n (oNoop, "sk-comments", "@"),
   ARGPARSE_s_n (oNoop, "no-sk-comments", "@"),
-  ARGPARSE_s_n (oNoop, "compress-keys", "@"),
-  ARGPARSE_s_n (oNoop, "compress-sigs", "@"),
 
   ARGPARSE_end ()
 };
-- 
2.1.0