gcc-changelog: prevent double cherry-pick line
contrib/ChangeLog: * gcc-changelog/git_commit.py: Add new check. * gcc-changelog/test_email.py: Test it. * gcc-changelog/test_patches.txt: Add new patch.
This commit is contained in:
parent
b88fdcc1c3
commit
f176773bc2
|
@ -423,7 +423,11 @@ class GitCommit:
|
||||||
continue
|
continue
|
||||||
elif line.startswith(CHERRY_PICK_PREFIX):
|
elif line.startswith(CHERRY_PICK_PREFIX):
|
||||||
commit = line[len(CHERRY_PICK_PREFIX):].rstrip(')')
|
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
|
continue
|
||||||
|
|
||||||
# ChangeLog name will be deduced later
|
# ChangeLog name will be deduced later
|
||||||
|
|
|
@ -362,6 +362,10 @@ class TestGccChangelog(unittest.TestCase):
|
||||||
assert '\t2020-06-11 Martin Liska <mliska@suse.cz>' in entry
|
assert '\t2020-06-11 Martin Liska <mliska@suse.cz>' in entry
|
||||||
assert '\t\t Jakub Jelinek <jakub@redhat.com>' in entry
|
assert '\t\t Jakub Jelinek <jakub@redhat.com>' in entry
|
||||||
|
|
||||||
|
def test_backport_double_cherry_pick(self):
|
||||||
|
email = self.from_patch_glob('double-cherry-pick.patch')
|
||||||
|
assert email.errors[0].message.startswith('multiple cherry pick lines')
|
||||||
|
|
||||||
def test_square_and_lt_gt(self):
|
def test_square_and_lt_gt(self):
|
||||||
email = self.from_patch_glob('0001-Check-for-more-missing')
|
email = self.from_patch_glob('0001-Check-for-more-missing')
|
||||||
assert not email.errors
|
assert not email.errors
|
||||||
|
|
|
@ -3160,6 +3160,35 @@ index 823eb539993..4ec22162c12 100644
|
||||||
--
|
--
|
||||||
2.27.0
|
2.27.0
|
||||||
|
|
||||||
|
=== double-cherry-pick.patch ===
|
||||||
|
From e1d68582022cfa2b1dc76646724b397ba2739439 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Liska <mliska@suse.cz>
|
||||||
|
Date: Thu, 11 Jun 2020 09:34:41 +0200
|
||||||
|
Subject: [PATCH] asan: fix RTX emission for ilp32
|
||||||
|
|
||||||
|
gcc/ChangeLog:
|
||||||
|
|
||||||
|
PR sanitizer/95634
|
||||||
|
* asan.c (asan_emit_stack_protection): Fix emission for ilp32
|
||||||
|
by using Pmode instead of ptr_mode.
|
||||||
|
|
||||||
|
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
|
||||||
|
(cherry picked from commit 8cff672cb9a132d3d3158c2edfc9a64b55292b80)
|
||||||
|
(cherry picked from commit 8cff672cb9a132d3d3158c2edfc9a64b55292b80)
|
||||||
|
---
|
||||||
|
gcc/asan.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gcc/asan.c b/gcc/asan.c
|
||||||
|
index 823eb539993..4ec22162c12 100644
|
||||||
|
--- a/gcc/asan.c
|
||||||
|
+++ b/gcc/asan.c
|
||||||
|
@@ -1 +1,2 @@
|
||||||
|
|
||||||
|
+
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
=== 0001-Check-for-more-missing-math-decls-on-vxworks.patch ===
|
=== 0001-Check-for-more-missing-math-decls-on-vxworks.patch ===
|
||||||
From 0edfc1fd22405ee8e946101e44cd8edc0ee12047 Mon Sep 17 00:00:00 2001
|
From 0edfc1fd22405ee8e946101e44cd8edc0ee12047 Mon Sep 17 00:00:00 2001
|
||||||
From: Douglas B Rupp <douglas.b.rupp@gmail.com>
|
From: Douglas B Rupp <douglas.b.rupp@gmail.com>
|
||||||
|
|
Loading…
Reference in New Issue