| Message ID | 20201021163136.27324-5-alex.bennee@linaro.org |
|---|---|
| State | Accepted |
| Commit | faf9828e2fbb62cb2edaeeaa48449193d952016f |
| Headers | show |
| Series | testing/next (gitdm, acceptance, docker, gitlab) | expand |
On 21/10/2020 18.31, Alex Bennée wrote: > 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) > Acked-by: Thomas Huth <thuth@redhat.com>
On 10/21/20 6:31 PM, Alex Bennée wrote: > 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(+) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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)