diff options
| author | Daniel Smith <daniel.smith@qt.io> | 2023-01-16 10:39:51 +0100 |
|---|---|---|
| committer | Daniel Smith <Daniel.Smith@qt.io> | 2023-01-17 14:01:28 +0000 |
| commit | 95c8b9d644a78a583c36e957a9a44c256e485ca4 (patch) | |
| tree | 17f2492cf273ad60ff535a490c083013fedeb9db | |
| parent | 5b4df3e6ff02a6af35d143d202b6e700a307144c (diff) | |
| download | qtrepotools-95c8b9d644a78a583c36e957a9a44c256e485ca4.tar.gz | |
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 <oswald.buddenhagen@gmx.de>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
| -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 58e8381..6d1d54a 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -318,7 +318,7 @@ while (<HEADS>) { } 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) { |