feat: clean revert of revert

christophehurpeau · Apr 24, 2024 · 8870f94 · 8870f94
1 parent e4e50b2
commit 8870f94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/events/pr-handlers/actions/utils/prTitle.test.ts b/src/events/pr-handlers/actions/utils/prTitle.test.ts
@@ -55,6 +55,12 @@ describe('cleanTitle', () => {
     ).toBe('revert: chore(deps): update node.js to v8.14');
   });
 
+  it('should correct revert of revert', () => {
+    expect(
+      cleanTitle('revert: revert: chore(deps): update node.js to v8.14', true),
+    ).toBe('chore(deps): update node.js to v8.14');
+  });
+
   it('should write correct revert with no issue', () => {
     expect(
       cleanTitle(

diff --git a/src/events/pr-handlers/actions/utils/prTitle.ts b/src/events/pr-handlers/actions/utils/prTitle.ts
@@ -18,5 +18,6 @@ export const cleanTitle = (
     .replace(/^([A-Za-z]+)[/:;]\s*/, (s, arg1) => `${arg1.toLowerCase()}: `)
     .replace(/\s+(-\s*)?[()[\]]\s*no[\s-]*isss?ue\s*[()[\]]$/i, ' [no issue]')
     .replace(/^Revert "([^"]+)"( \[no issue])?$/, 'revert: $1$2')
-    .replace(/^(revert:.*)(\s+\(#\d+\))( \[no issue])?$/, '$1$3');
+    .replace(/^(revert:.*)(\s+\(#\d+\))( \[no issue])?$/, '$1$3')
+    .replace(/^(?:revert: ){2}/, '');
 };