[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 4/6] gitlab: skip checkpatch.pl checks if no commit delta on b
From: |
Alex Bennée |
Subject: |
[PATCH v1 4/6] gitlab: skip checkpatch.pl checks if no commit delta on branch |
Date: |
Wed, 21 Oct 2020 17:31:34 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
If the current branch is synced to the current upstream git master,
there are no commits that need checking. This causes checkpatch.pl
to print an error that it found no commits. We need to avoid calling
checkpatch.pl in this case.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20201019143537.283094-2-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/check-patch.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py
index 5a14a25b13..0ff30ee077 100755
--- a/.gitlab-ci.d/check-patch.py
+++ b/.gitlab-ci.d/check-patch.py
@@ -33,8 +33,16 @@ ancestor = subprocess.check_output(["git", "merge-base",
ancestor = ancestor.strip()
+log = subprocess.check_output(["git", "log", "--format=%H %s",
+ ancestor + "..."],
+ universal_newlines=True)
+
subprocess.check_call(["git", "remote", "rm", "check-patch"])
+if log == "":
+ print("\nNo commits since %s, skipping checks\n" % ancestor)
+ sys.exit(0)
+
errors = False
print("\nChecking all commits since %s...\n" % ancestor)
--
2.20.1
- [PATCH v1 1/6] Adding ani's email as an individual contributor, (continued)
- [PATCH v1 1/6] Adding ani's email as an individual contributor, Alex Bennée, 2020/10/21
- [PATCH v1 2/6] contrib/gitdm: Add more individual contributors, Alex Bennée, 2020/10/21
- [PATCH v1 5/6] scripts: fix error from checkpatch.pl when no commits are found, Alex Bennée, 2020/10/21
- [PATCH v1 6/6] tests/acceptance: pick a random gdb port for reverse debugging, Alex Bennée, 2020/10/21
- Re: [PATCH v1 6/6] tests/acceptance: pick a random gdb port for reverse debugging, Pavel Dovgalyuk, 2020/10/22
- Re: [PATCH v1 6/6] tests/acceptance: pick a random gdb port for reverse debugging, Cleber Rosa, 2020/10/22
- [PATCH v1 4/6] gitlab: skip checkpatch.pl checks if no commit delta on branch,
Alex Bennée <=
- [PATCH v1 3/6] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1, Alex Bennée, 2020/10/21