diff options
Diffstat (limited to 'contrib/gcc-changelog/git_commit.py')
| -rwxr-xr-x | contrib/gcc-changelog/git_commit.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 0008865..80ae0b2 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -423,7 +423,11 @@ class GitCommit: continue elif line.startswith(CHERRY_PICK_PREFIX): commit = line[len(CHERRY_PICK_PREFIX):].rstrip(')') - self.cherry_pick_commit = commit + if self.cherry_pick_commit: + self.errors.append(Error('multiple cherry pick lines', + line)) + else: + self.cherry_pick_commit = commit continue # ChangeLog name will be deduced later |