diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-18 20:08:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-18 21:25:56 +0100 |
| commit | 34e251e3878dbeefb38057df19067c6db3a1a37f (patch) | |
| tree | d10b1a9b33928a6d822c77c1e0a45424a9b457b8 | |
| parent | b332f4cf3b2b49f2d170215cbd757c42f7e5dd98 (diff) | |
| download | qtrepotools-34e251e3878dbeefb38057df19067c6db3a1a37f.tar.gz | |
suppress W-I-P check for merges
branch names can contain "wip", which triggers false positives.
let's assume that nobody will actually keep around wip merges, so just
disable the check for merges completely.
(cherry picked from commit a7f118d1b92d4aa26a8e3fbe978ba75c4075835e)
| -rwxr-xr-x | git-hooks/sanitize-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index 750248b..8ec5a3c 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -88,7 +88,7 @@ while (<MSG>) { } if ($ln == 0) { $summary = $_; - if (!$iswip && /\bWIP\b|\*{3}|^(?:squash|fixup)! |^(.)\1*$/i) { + if (!$iswip && $parents < 2 && /\bWIP\b|\*{3}|^(?:squash|fixup)! |^(.)\1*$/i) { &complain("Apparently pushing a Work In Progress", "wip", 1); } elsif (!$iswip && !$badlog && length($_) < 7) { &complain("Log message summary is too short", "log"); |