From 050705f615e5c54acc7d2c1190d2d997a0d1c3ce Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 25 May 2020 14:42:20 +0200 Subject: Treat wip branches like dev to suppress cherry-pick messages wip/* branches don't need to be notified of missing pick-to footers since users working on wip branches should know what they're doing. Even though cherry-pick bot is enabled in an entire repo, the usefulness of sanity-checking for pick-to footers is very limited in wip branches. The easiest way around this is to treat wip branches like dev when running in gerrit. Task-number: QTQAINFRA-3751 Change-Id: I81fd427e83ebcd703f9b1700bf00367544c98a0e Reviewed-by: Oswald Buddenhagen --- git-hooks/sanitize-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-hooks') diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index e5fada1..bebe4ee 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -572,7 +572,7 @@ if ($with_pickbot) { my $onDev; my $masterName = $foundDev ? "dev" : "master"; if (defined($target)) { - $onDev = ($target eq $masterName); + $onDev = ($target eq $masterName) || ($target =~ m,^wip/,); } else { my $masterRev = $allHeads{$masterName}; chomp(my $sha1Base = `git merge-base $sha1 $masterRev`); -- cgit v1.2.1