From af58331f67db0cfdaba87299c79bf6ef2df5e850 Mon Sep 17 00:00:00 2001 From: peterylh Date: Fri, 29 Jan 2021 23:22:28 +0800 Subject: [PATCH] [KYUUBI #320] Fix Merge PR with duplicated title ![yaooqinn](https://badgen.net/badge/Hello/yaooqinn/green) [![Closes%20#320](https://badgen.net/badge/Preview/Closes%2520%23320/blue)](https://github.com/yaooqinn/kyuubi/pull/320) ![1](https://badgen.net/badge/%2B/1/red) ![1](https://badgen.net/badge/-/1/green) ![1](https://badgen.net/badge/commits/1/yellow) [❨?❩](https://pullrequestbadge.com/?utm_medium=github&utm_source=yaooqinn&utm_campaign=badge_info) duplicated ### _Which issue are you going to fix?_ Fixes #${ID} ### _Why are the changes needed?_ duplicated PR ID in the merged title ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request Closes #320 from yaooqinn/mergepr2. 8cbcf1b [peterylh] Fix Merge PR with duplicated title Authored-by: peterylh Signed-off-by: Kent Yao --- dev/merge_kyuubi_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py index 7f423b942..a8afc5710 100755 --- a/dev/merge_kyuubi_pr.py +++ b/dev/merge_kyuubi_pr.py @@ -84,7 +84,7 @@ def clean_up(): run_cmd("git branch -D %s" % branch) def fix_title(text, num): - if (re.search(r'^\[KYUUBI #[0-9]{3,6}\](\[[A-Z0-9_\s,]+\] )+\S+', text)): + if (re.search(r'^\[KYUUBI\s#[0-9]{3,6}\].*', text)): return text return '[KYUUBI #%s] %s' % (num, text)