diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2009-11-07 10:40:00 +0100 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2009-11-07 10:40:00 +0100 |
commit | 73141bfd92b8baec4dfd45bb99275b53512ec2b9 (patch) | |
tree | 7923763bca3936a03c1124420c262439e7653fbf /tools/git-notify | |
parent | d100429a4816da68f65c2a5be291e7ae7beb5e17 (diff) | |
download | monitoring-plugins-73141bfd92b8baec4dfd45bb99275b53512ec2b9.tar.gz |
git-notify: Fix "global" notifications
If the number of commits included with a single push exceeds the maximum
specified via "-n", a single notification will be generated instead of
individual e-mails. For listing the commits within such a notification,
git-rev-list(1)'s "--pretty" option is used. This yields output which
the git_rev_list() subroutine didn't accept. That's now fixed.
Diffstat (limited to 'tools/git-notify')
-rwxr-xr-x | tools/git-notify | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/git-notify b/tools/git-notify index 8ade7b8a..e64754c3 100755 --- a/tools/git-notify +++ b/tools/git-notify | |||
@@ -145,7 +145,10 @@ sub git_rev_list(@) | |||
145 | while (<REVLIST>) | 145 | while (<REVLIST>) |
146 | { | 146 | { |
147 | chomp; | 147 | chomp; |
148 | die "Invalid commit: $_" if not /^[0-9a-f]{40}$/; | 148 | unless (grep {$_ eq "--pretty"} @args) |
149 | { | ||
150 | die "Invalid commit: $_" if not /^[0-9a-f]{40}$/; | ||
151 | } | ||
149 | push @$revlist, $_; | 152 | push @$revlist, $_; |
150 | } | 153 | } |
151 | close REVLIST or die $! ? "Cannot execute rev-list: $!" : "rev-list exited with status: $?"; | 154 | close REVLIST or die $! ? "Cannot execute rev-list: $!" : "rev-list exited with status: $?"; |