I'm not redefining any subs after all, don't prevent those warnings.

[git.ikiwiki.info.git] / IkiWiki / Plugin / cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c09e4f9aa7df4f5cd650aca94b8a419b05c89939..ac188d4a123569921236a4f4c3254fd14988f0fe 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -6,6 +6,7 @@ use strict;
 use IkiWiki;
 
 sub import {
+       hook(type => "getopt", id => "cvs", call => \&getopt);
        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
        hook(type => "getsetup", id => "cvs", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,6 +21,13 @@ sub import {
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
+sub getopt () {
+       # "cvs add dir" acts immediately on the repository.
+       # post-commit gets confused by this and doesn't need to act on it.
+       # If that's why we're here, terminate the process.
+       ((grep /New directory/, @ARGV) > 0) && exit 0;
+}
+
 sub checkconfig () {
        if (! defined $config{cvspath}) {
                $config{cvspath}="ikiwiki";