diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index 8ea2f7431340d07160fdae236e28b6c2e85bbbbd..6ec4c76115598fb341cb493eb2f71d4f7adaf0e8 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -11,14 +11,15 @@ use strict; use warnings; use Cwd; -if ($#ARGV < 0 or $#ARGV > 1 || ($#ARGV == 1 && $ARGV[1] !~ /^(strict|gerrit(-rest)?)$/)) { - print STDERR "Usage: $0 <sha1> [strict]\n"; +if ($#ARGV < 0 or $#ARGV > 2 or ($#ARGV >= 1 && $ARGV[1] !~ /^(easy|strict|gerrit(-rest)?)$/)) { + print STDERR "Usage: $0 <sha1> [{easy|strict|gerrit|gerrit-rest} [instance]]\n"; exit 2; } my $sha1 = $ARGV[0]; -my $gerrit_rest = ($#ARGV == 1 && $ARGV[1] eq "gerrit-rest"); -my $gerrit = $gerrit_rest || ($#ARGV == 1 && $ARGV[1] eq "gerrit"); -my $strict = $gerrit || ($#ARGV == 1 && $ARGV[1] eq "strict"); +my $gerrit_rest = ($#ARGV >= 1 && $ARGV[1] eq "gerrit-rest"); +my $gerrit = $gerrit_rest || ($#ARGV >= 1 && $ARGV[1] eq "gerrit"); +my $strict = $gerrit || ($#ARGV >= 1 && $ARGV[1] eq "strict"); +my $instance = ($#ARGV == 2) ? $ARGV[2] : "default"; my $repo = getcwd(); $repo =~ s,/?\.git$,,; @@ -27,6 +28,8 @@ my %config = (); for (`git config --list`) { if (/^sanity\.\Q$repo\E\.([^=]+)=(.*$)/) { $config{$1} = $2; + } elsif (/^sanity\.\Q$instance\E\.([^=]+)=(.*$)/) { + $config{$1} = $2; } }