Skip to content

Commit e5bdc5c

Browse files
10xLaCroixDrinkerbyCedric
authored andcommitted
fix(is-ignored): ignore bitbuckets automatic merge (#573)
1 parent bc06c05 commit e5bdc5c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

@commitlint/is-ignored/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const WILDCARDS = [
1717
),
1818
c => c.match(/^Merged (.*?)(in|into) (.*)/),
1919
c => c.match(/^Merge remote-tracking branch (.*)/),
20-
c => c.match(/^Automatic merge from (.*)/),
20+
c => c.match(/^Automatic merge(.*)/),
2121
c => c.match(/^Auto-merged (.*?) into (.*)/)
2222
];
2323

@commitlint/is-ignored/src/index.test.js

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ test('should return true for bitbucket merge commits', t => {
107107
isIgnored('Merged in feature/facebook-friends-sync (pull request #8)')
108108
);
109109
t.true(isIgnored('Merged develop into feature/component-form-select-card'));
110+
t.true(isIgnored('Automatic merge'));
110111
});
111112

112113
test('should return true for automatic merge commits', t => {

0 commit comments

Comments
 (0)