From 95c8b9d644a78a583c36e957a9a44c256e485ca4 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 16 Jan 2023 10:39:51 +0100 Subject: Include tqtc/lts- and lts- branches in the list of all heads When these branches are missing from the heads, the sanity bot wrongly claims "Cherry-pick's source is not an upstream commit" when picking from an LTS branch to anywhere. Fixes: QTQAINFRA-5361 Change-Id: I9c35b61ca0f913aa5ec956aa947b928cfe685fba Reviewed-by: Oswald Buddenhagen Reviewed-by: Dimitrios Apostolou --- 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 58e8381..6d1d54a 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -318,7 +318,7 @@ while () { } if ($name =~ m,/dev$,) { $foundDev = 1; - } elsif ($name =~ m,/(\d+(?:\.\d+)+)$,) { + } elsif ($name =~ m,/((?:(?:tqtc/)?lts-)?\d+(?:\.\d+)+)$,) { my $branch = $1; ONCE: while (1) { foreach my $lts (@LTS) { -- cgit v1.2.1