fix(cherry-pick-bot): allow forward slash in branch name (#4854)

googleapis · Jan 4, 2023 · 59f7788 · 59f7788
1 parent 56c391b
commit 59f7788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/cherry-pick-bot/src/cherry-pick.ts b/packages/cherry-pick-bot/src/cherry-pick.ts
@@ -33,7 +33,7 @@ interface Commit {
   sha: string;
 }
 
-const COMMENT_REGEX = /^\/cherry-pick\s+(?<branch>\w[.-\w]*)/;
+const COMMENT_REGEX = /^\/cherry-pick\s+(?<branch>\w[./-\w]*)/;
 
 /**
  * Parse a comment string to see if it matches the expected cherry-pick

diff --git a/packages/cherry-pick-bot/test/cherry-pick.ts b/packages/cherry-pick-bot/test/cherry-pick.ts
@@ -45,6 +45,11 @@ describe('parseCherryPickComment', () => {
     const branch = parseCherryPickComment('\n/cherry-pick 2.1.x   ');
     assert.strictEqual(branch, '2.1.x');
   });
+
+  it('handles forward slash format', () => {
+    const branch = parseCherryPickComment('\n/cherry-pick release/2.1.x   ');
+    assert.strictEqual(branch, 'release/2.1.x');
+  });
 });
 
 describe('cherryPickCommits', () => {