summaryrefslogtreecommitdiff
path: root/IkiWiki/Wrapper.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-02 15:36:16 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-02 15:36:16 -0400
commitbb2697ca5e39bc40a18aa01582087cc5c558442e (patch)
treeddddbddf8aa8b0c226aaf6c04f7c00ced72b2aff /IkiWiki/Wrapper.pm
parent4026650c8751f29890692f10833dae2b200cfc78 (diff)
parent85844b8494dd5e032d06afd623c25b4bb4a72578 (diff)
Merge commit 'schmonz/master' into cvs
Diffstat (limited to 'IkiWiki/Wrapper.pm')
-rw-r--r--IkiWiki/Wrapper.pm13
1 files changed, 13 insertions, 0 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6555fe625..cc2223d7a 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -44,6 +44,18 @@ EOF
$test_receive=IkiWiki::Receive::gen_wrapper();
}
+ my $check_cvs_add_dir="";
+ if ($config{rcs} eq 'cvs') {
+ $check_cvs_add_dir=<<"EOF";
+ {
+ int j;
+ for (j = 1; j < argc; j++)
+ if (strstr(argv[j], "New directory") != NULL)
+ exit(0);
+ }
+EOF
+ }
+
my $check_commit_hook="";
my $pre_exec="";
if ($config{post_commit}) {
@@ -119,6 +131,7 @@ addenv(char *var, char *val) {
int main (int argc, char **argv) {
char *s;
+$check_cvs_add_dir
$check_commit_hook
$test_receive
$envsave