aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2020-10-21 17:31:34 +0100
committerAlex Bennée <alex.bennee@linaro.org>2020-10-27 09:53:48 +0000
commitfaf9828e2fbb62cb2edaeeaa48449193d952016f (patch)
tree6e1ff4b8294967c1fc4b86eb3bc7c52f091f9bd5
parent5ed7ca318541133de14de538f2c67d8c6b08b861 (diff)
downloadqemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.zip
qemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.tar.gz
qemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.tar.bz2
gitlab: skip checkpatch.pl checks if no commit delta on branch
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> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Thomas Huth <thuth@redhat.com> Message-Id: <20201019143537.283094-2-berrange@redhat.com> Message-Id: <20201021163136.27324-5-alex.bennee@linaro.org>
-rwxr-xr-x.gitlab-ci.d/check-patch.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py
index 5a14a25..0ff30ee 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)