diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-09-09 11:29:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 11:29:56 +0300 |
| commit | 0e115aae9d840a20e684abb338474b7e7718278f (patch) | |
| tree | 59d1d578d3131929834e2a27c729696797a7f32d | |
| parent | 47e8321fd75328ba9e531bed77aece95130d70dc (diff) | |
| parent | 1a2262108ac52263e5d8a6a12fef1e0797e8f7eb (diff) | |
Merge PR #5867: Backport "MAINT: Extend changelog script"
| -rwxr-xr-x | scripts/generateChangelog.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/generateChangelog.py b/scripts/generateChangelog.py index 507c3626c..d4f8b6578 100755 --- a/scripts/generateChangelog.py +++ b/scripts/generateChangelog.py @@ -39,6 +39,7 @@ def main(): mergeCommitPattern = re.compile("^([0-9a-f]+)\s*[Mm]erge\s.+?#(\d+):?\s*(.+)$", re.MULTILINE) backportCommitPattern = re.compile("^[Bb]ackport\s*\"(.*)\".*$") + mergePrefixPattern = re.compile("^Merge PR #\d+:") commits = cmd(["git", "log" ,"--format=oneline", "--date=short", "{}..{}".format(args.FROM_TAG, args.TO_TAG)]).split("\n") @@ -66,6 +67,9 @@ def main(): # This commit is a backport commit where the actual commit title is the bit in the quotes commitTitle = backportMatch.group(1) + if re.match(mergePrefixPattern, commitTitle): + commitTitle = commitTitle[ commitTitle.find(":") + 1 : ] + try: commit = CommitMessage(commitTitle) |