[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branc
From: |
Alex Bennée |
Subject: |
[PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch |
Date: |
Tue, 27 Oct 2020 09:59:34 +0000 |
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>
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>
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
- [PULL 0/8] testing and misc (gitdm, gitlab, docker, make), Alex Bennée, 2020/10/27
- [PULL 1/8] Adding ani's email as an individual contributor, Alex Bennée, 2020/10/27
- [PULL 2/8] contrib/gitdm: Add more individual contributors, Alex Bennée, 2020/10/27
- [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1, Alex Bennée, 2020/10/27
- [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch,
Alex Bennée <=
- [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found, Alex Bennée, 2020/10/27
- [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging, Alex Bennée, 2020/10/27
- [PULL 7/8] gitlab-ci: Clone from GitLab itself, Alex Bennée, 2020/10/27
- [PULL 8/8] makefile: handle -n / -k / -q correctly, Alex Bennée, 2020/10/27
- Re: [PULL 0/8] testing and misc (gitdm, gitlab, docker, make), Peter Maydell, 2020/10/29