summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/git-notify4
-rwxr-xr-xtools/git-post-receive-hook2
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/git-notify b/tools/git-notify
index faa1785..d852823 100755
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -48,7 +48,7 @@ sub get_repos_name();
48my $mailer = "/usr/bin/mail"; 48my $mailer = "/usr/bin/mail";
49 49
50# CIA notification address 50# CIA notification address
51my $cia_address = "cia\@cia.navi.cx"; 51my $cia_address = "cia\@cia.vc";
52 52
53# debug mode 53# debug mode
54my $debug = 0; 54my $debug = 0;
@@ -327,7 +327,7 @@ sub mail_notification($$$@)
327{ 327{
328 my ($name, $subject, $content_type, @text) = @_; 328 my ($name, $subject, $content_type, @text) = @_;
329 329
330 $subject = "[$repos_name] $subject" if $emit_repo; 330 $subject = "[$repos_name] $subject" if ($emit_repo and $name ne $cia_address);
331 $subject = encode("MIME-Q",$subject); 331 $subject = encode("MIME-Q",$subject);
332 332
333 if ($debug) 333 if ($debug)
diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook
index 70d259e..fd1f869 100755
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -4,11 +4,13 @@ prefix="${0%/*}/notifications" # $GIT_DIR/hooks/notifications
4recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>' 4recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>'
5maxcommits=100 5maxcommits=100
6maxdiffsize=$((300 * 1024)) 6maxdiffsize=$((300 * 1024))
7project='nagiosplug'
7gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug' 8gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug'
8gitnotify="$prefix/git-notify.pl" 9gitnotify="$prefix/git-notify.pl"
9statefile="$prefix/git-notify.dat" 10statefile="$prefix/git-notify.dat"
10 11
11exec "$gitnotify" \ 12exec "$gitnotify" \
13 -c "$project" \
12 -m "$recipient" \ 14 -m "$recipient" \
13 -n "$maxcommits" \ 15 -n "$maxcommits" \
14 -s "$maxdiffsize" \ 16 -s "$maxdiffsize" \