From d16268b2730cc78e4deffe9e7c2bf9867ae8bcd4 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 16 Jun 2021 09:58:12 -0700 Subject: [PATCH] Fix update-release-branch-fix.py This change ensures that the the script can handle commits with no committer in them. This will happen for some commits that are auto-generated during PRs. --- .github/update-release-branch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 5e839dd55..749e315b1 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -122,7 +122,7 @@ def get_commit_difference(repo): # Is the given commit the automatic merge commit from when merging a PR def is_pr_merge_commit(commit): - return commit.committer.login == 'web-flow' and len(commit.parents) > 1 + return commit.committer is not None and commit.committer.login == 'web-flow' and len(commit.parents) > 1 # Gets a copy of the commit message that should display nicely def get_truncated_commit_message(commit):