From: Daniel P. Berrangé Date: Wed, 21 Oct 2020 16:31:34 +0000 (+0100) Subject: gitlab: skip checkpatch.pl checks if no commit delta on branch X-Git-Tag: v5.2.0-rc0~23^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=faf9828e2fbb62cb2edaeeaa48449193d952016f;p=thirdparty%2Fqemu.git 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth 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 5a14a25b132..0ff30ee0774 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)