init: drop -N alias for --skip-artnum

It may be too easily confused for --newsgroup or --ng.  This is
too rarely used and never made it into a release, so it should
be fine.

diff --git a/Documentation/public-inbox-init.pod b/Documentation/public-inbox-init.pod
index ea2b38dd27dbf60ccbe52ce4c0dde29435cf80ae..31c5f743edb818dc8edf1d0abdf9558eef0260d7 100644 (file)
--- a/Documentation/public-inbox-init.pod
+++ b/Documentation/public-inbox-init.pod
@@ -54,7 +54,7 @@ Available since public-inbox 1.6.0 (PENDING).
 
 Default: none.
 
-=item -N, --skip-artnum
+=item --skip-artnum
 
 This option allows archivists to publish incomplete archives
 with only new mail while allowing NNTP article numbers

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 90b32be8e2e46f033e7a40acc36a8e81542079b1..b19c2321ae22a72202f3db2d6c986b24d3b91cdc 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -39,7 +39,7 @@ my %opts = (
        'V|version=i' => \$version,
        'L|index-level|indexlevel=s' => \$indexlevel,
        'S|skip|skip-epoch=i' => \$skip_epoch,
-       'N|skip-artnum=i' => \$skip_artnum,
+       'skip-artnum=i' => \$skip_artnum,
        'j|jobs=i' => \$jobs,
        'ng|newsgroup=s' => \$ng,
        'help|?' => \$show_help,

diff --git a/t/init.t b/t/init.t
index 6211bb58fba8b12a43cc786255e629c28c51d95d..4d2c50496fc92b15bdf7b95521c77d0c58d10905 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -116,7 +116,7 @@ SKIP: {
                        'publicinboxmda.spamcheck', 'none') == 0 or
                        BAIL_OUT "git config $?";
        my $addr = 'skip3@example.com';
-       $cmd = [ qw(-init -V2 -Lbasic -N12 skip3), "$tmpdir/skip3",
+       $cmd = [ qw(-init -V2 -Lbasic --skip-artnum=12 skip3), "$tmpdir/skip3",
                   qw(http://example.com/skip3), $addr ];
        ok(run_script($cmd), '--skip-artnum -V2');
        my $env = { ORIGINAL_RECIPIENT => $addr };
@@ -131,7 +131,7 @@ SKIP: {
 
        $addr = 'skip4@example.com';
        $env = { ORIGINAL_RECIPIENT => $addr };
-       $cmd = [ qw(-init -V1 -N12 -Lmedium skip4), "$tmpdir/skip4",
+       $cmd = [ qw(-init -V1 --skip-artnum 12 -Lmedium skip4), "$tmpdir/skip4",
                   qw(http://example.com/skip4), $addr ];
        ok(run_script($cmd), '--skip-artnum -V1');
        $err = '';