Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Fix handling of ** in .gitignore files by updating to a libgit2 fork #97

Merged
nathansobo merged 2 commits into from
Jun 20, 2019
Merged

Fix handling of ** in .gitignore files by updating to a libgit2 fork #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa4ed4
Update deps/libgit2 submodule to include fix for ** in gitignore
Jun 17, 2019
12d7ac6
Fix Windows build problems with new libgit2 version
Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 62 additions & 8 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
'deps/libgit2/src/fileops.h',
'deps/libgit2/src/filter.c',
'deps/libgit2/src/filter.h',
'deps/libgit2/src/fnmatch.c',
'deps/libgit2/src/fnmatch.h',
'deps/libgit2/src/wildmatch.c',
'deps/libgit2/src/wildmatch.h',
'deps/libgit2/src/global.c',
'deps/libgit2/src/global.h',
'deps/libgit2/src/graph.c',
Expand Down Expand Up @@ -239,8 +239,8 @@
'deps/libgit2/src/stash.c',
'deps/libgit2/src/status.c',
'deps/libgit2/src/status.h',
'deps/libgit2/src/stdalloc.c',
'deps/libgit2/src/stdalloc.h',
'deps/libgit2/src/allocators/stdalloc.c',
'deps/libgit2/src/allocators/stdalloc.h',
'deps/libgit2/src/stream.h',
'deps/libgit2/src/strmap.c',
'deps/libgit2/src/strmap.h',
Expand Down Expand Up @@ -340,9 +340,10 @@
['OS=="win"', {
'defines': [
'GIT_WINHTTP',
'GIT_REGEX_BUILTIN',
],
'include_dirs': [
'deps/libgit2/deps/regex',
'dependencies': [
'pcre',
],
'link_settings': {
'libraries': [
Expand Down Expand Up @@ -380,6 +381,7 @@
4013, # 'InterlockedDecrement' undefined; assuming extern returning int
],
'sources': [
'deps/libgit2/src/net.c',
'deps/libgit2/src/win32/dir.c',
'deps/libgit2/src/win32/dir.h',
'deps/libgit2/src/win32/error.c',
Expand Down Expand Up @@ -410,8 +412,6 @@
'deps/libgit2/src/win32/w32_util.c',
'deps/libgit2/src/win32/w32_util.h',
'deps/libgit2/src/win32/win32-compat.h',
'deps/libgit2/deps/regex/regex.c',
'deps/libgit2/deps/regex/regex.h',
],
}, {
'libraries': [
Expand Down Expand Up @@ -519,4 +519,58 @@
],
},
],
'conditions': [
['OS=="win"', {
'targets': [
{
'target_name': 'pcre',
'win_delay_load_hook': 'false',
'type': 'static_library',
'sources': [
'deps/libgit2/deps/pcre/pcre_byte_order.c',
'deps/libgit2/deps/pcre/pcre_chartables.c',
'deps/libgit2/deps/pcre/pcre_compile.c',
'deps/libgit2/deps/pcre/pcre_config.c',
'deps/libgit2/deps/pcre/pcre_dfa_exec.c',
'deps/libgit2/deps/pcre/pcre_exec.c',
'deps/libgit2/deps/pcre/pcre_fullinfo.c',
'deps/libgit2/deps/pcre/pcre_get.c',
'deps/libgit2/deps/pcre/pcre_globals.c',
'deps/libgit2/deps/pcre/pcre_jit_compile.c',
'deps/libgit2/deps/pcre/pcre_maketables.c',
'deps/libgit2/deps/pcre/pcre_newline.c',
'deps/libgit2/deps/pcre/pcre_ord2utf8.c',
'deps/libgit2/deps/pcre/pcre_refcount.c',
'deps/libgit2/deps/pcre/pcre_string_utils.c',
'deps/libgit2/deps/pcre/pcre_study.c',
'deps/libgit2/deps/pcre/pcre_tables.c',
'deps/libgit2/deps/pcre/pcre_ucd.c',
'deps/libgit2/deps/pcre/pcre_valid_utf8.c',
'deps/libgit2/deps/pcre/pcre_version.c',
'deps/libgit2/deps/pcre/pcre_xclass.c',
'deps/libgit2/deps/pcre/pcreposix.c',
],
'defines': [
'SUPPORT_PCRE8=1',
'LINK_SIZE=2',
'PARENS_NEST_LIMIT=250',
'MATCH_LIMIT=10000000',
'MATCH_LIMIT_RECURSION="MATCH_LIMIT"',
'NEWLINE="LF"',
'NO_RECURSE=1',
'POSIX_MALLOC_THRESHOLD=10',
'BSR_ANYCRLF=0',
'MAX_NAME_SIZE=32',
'MAX_NAME_COUNT=10000',
],
'include_dirs': [],
'direct_dependent_settings': {
'include_dirs': [
'deps/libgit2/deps/pcre',
],
},
},
]
}]
]
}
2 changes: 1 addition & 1 deletion deps/libgit2
Open in desktop
Submodule libgit2 updated 2645 files
44 changes: 25 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions spec/fixtures/ignored.git/info/exclude
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
a.txt
**.foo
2 changes: 2 additions & 0 deletions spec/git-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ describe('git', () => {
repo = git.open(ignoreRepoDir)
expect(repo.isIgnored('a.txt')).toBe(true)
expect(repo.isIgnored('subdir/subdir')).toBe(true)
expect(repo.isIgnored('a.foo')).toBe(true)
expect(repo.isIgnored('subdir/a.foo')).toBe(true)
})
})

Expand Down