Skip to content

Commit 93d1adc

Browse files
committed
fix(handler): field missing when merging .gitignore
field missing when merging .gitignore while use merge handler
1 parent 1109860 commit 93d1adc

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/handlers/merge/merge-gitignore.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ module.exports = file => {
3333
}
3434
})
3535

36+
if (lastIgnoreListIndex < projectIgnoreList.length) {
37+
const lastProjectListFragment = projectIgnoreList
38+
.slice(lastProjectIgnoreListIndex, projectIgnoreList.length)
39+
.filter(item => !ignoreList.includes(item) && item.length)
40+
mergedList.push(...lastProjectListFragment)
41+
}
3642

3743
mergedList = mergedList.reduce((list, item) => {
3844
if (!item.length || !list.includes(item)) list.push(item)

0 commit comments

Comments
 (0)