diff options
| author | Martin Liska <mliska@suse.cz> | 2020-05-20 09:57:05 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-05-20 09:57:05 +0200 |
| commit | 713890935db33b1e24abfae6a94bacc494f6412e (patch) | |
| tree | 87742bf8f2c5d62e0e025635bced1a7651f1c972 /contrib/gcc-changelog/git_commit.py | |
| parent | 4a88caf21a0a85129f6c985ca13ba3eb54ff5366 (diff) | |
| download | gcc-713890935db33b1e24abfae6a94bacc494f6412e.zip gcc-713890935db33b1e24abfae6a94bacc494f6412e.tar.gz gcc-713890935db33b1e24abfae6a94bacc494f6412e.tar.bz2 | |
Add gcc-backport and support git cherry pick.
* gcc-changelog/git_commit.py: Support cherry pick
prefix.
* gcc-changelog/test_email.py: Test it.
* gcc-changelog/test_patches.txt: Add new patch.
* gcc-git-customization.sh: Add gcc-backport.
Diffstat (limited to 'contrib/gcc-changelog/git_commit.py')
| -rwxr-xr-x | contrib/gcc-changelog/git_commit.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index f6b9c5b..5cc8c4f 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -150,6 +150,7 @@ star_prefix_regex = re.compile(r'\t\*(?P<spaces>\ *)(?P<content>.*)') LINE_LIMIT = 100 TAB_WIDTH = 8 CO_AUTHORED_BY_PREFIX = 'co-authored-by: ' +CHERRY_PICK_PREFIX = '(cherry picked from commit ' class Error: @@ -349,6 +350,8 @@ class GitCommit: author = self.format_git_author(name) self.co_authors.append(author) continue + elif line.startswith(CHERRY_PICK_PREFIX): + continue # ChangeLog name will be deduced later if not last_entry: |