From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
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 [thread overview]
Message-ID: <20201021163136.27324-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201021163136.27324-1-alex.bennee@linaro.org>
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
next prev parent reply other threads:[~2020-10-21 16:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 16:31 [PATCH v1 0/6] testing/next (gitdm, acceptance, docker, gitlab) Alex Bennée
2020-10-21 16:31 ` [PATCH v1 1/6] Adding ani's email as an individual contributor Alex Bennée
2020-10-21 16:31 ` [PATCH v1 2/6] contrib/gitdm: Add more individual contributors Alex Bennée
2020-10-21 17:16 ` Philippe Mathieu-Daudé
2020-10-21 16:31 ` [PATCH v1 3/6] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 Alex Bennée
2020-10-21 17:17 ` Philippe Mathieu-Daudé
2020-10-21 16:31 ` Alex Bennée [this message]
2020-10-22 4:54 ` [PATCH v1 4/6] gitlab: skip checkpatch.pl checks if no commit delta on branch Thomas Huth
2020-10-22 11:08 ` Philippe Mathieu-Daudé
2020-10-21 16:31 ` [PATCH v1 5/6] scripts: fix error from checkpatch.pl when no commits are found Alex Bennée
2020-10-21 16:31 ` [PATCH v1 6/6] tests/acceptance: pick a random gdb port for reverse debugging Alex Bennée
2020-10-22 5:20 ` Thomas Huth
2020-10-22 11:07 ` Philippe Mathieu-Daudé
2020-10-22 13:07 ` Alex Bennée
2020-10-22 6:18 ` Pavel Dovgalyuk
2020-10-22 15:46 ` Cleber Rosa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201021163136.27324-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).