Skip to content

Commit 55bbef8

Browse files
feat: Skip lint when merging remote branch (#207)
1 parent 7c6392f commit 55bbef8

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

__tests__/lint.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ test("should", async () => {
77
squash!
88
revert something
99
Merge branch 'master' of github.com:folke/devmoji
10+
Merge remote-tracking branch 'master' of github.com:folke/devmoji
1011
style: 🎨 Prettier 2.0
1112
chore(release): 2.1.8 [skip ci]
1213
fix(deps): update dependency chalk to v4 (#49)

src/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class Cli {
1818

1919
lint(text: string) {
2020
text = text.split("\n")[0]
21-
if (text.startsWith("Merge branch")) return []
21+
if (/^(Merge (remote-tracking )?branch)/.test(text)) return []
2222
if (/^(fixup|squash)!/.test(text)) return []
2323
if (/^([rR]evert)/.test(text)) return []
2424

0 commit comments

Comments
 (0)