From 769ff77c9c5afaec97350a4931e5ca123b6af6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 27 Mar 2020 14:38:49 +0000 Subject: [PATCH] scripts: avoid error in DCO check on empty branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the DCO check is run on an empty branch (ie one which has no commits different from master), it throws an error due to trying to interpret the empty string as a git commit SHA. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrangé --- scripts/require-dco.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/require-dco.py b/scripts/require-dco.py index 9fe13823a9..ae94393319 100755 --- a/scripts/require-dco.py +++ b/scripts/require-dco.py @@ -46,7 +46,10 @@ print("\nChecking for 'Signed-off-by: NAME ' on all commits since %s...\n log = subprocess.check_output(["git", "log", "--format=%H %s", ancestor + "..."], universal_newlines=True) -commits = [[c[0:40], c[41:]] for c in log.strip().split("\n")] +if log == "": + commits = [] +else: + commits = [[c[0:40], c[41:]] for c in log.strip().split("\n")] for sha, subject in commits: -- GitLab