Update deps/libgit2 submodule to include fix for ** in gitignore

See libgit2/libgit2#5110
atom · Jun 17, 2019 · 7aa4ed4 · 7aa4ed4
1 parent 7651345
commit 7aa4ed4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 24 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -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',
@@ -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',

diff --git a/deps/libgit2 b/deps/libgit2
diff --git a/package-lock.json b/package-lock.json
diff --git a/spec/fixtures/ignored.git/info/exclude b/spec/fixtures/ignored.git/info/exclude
@@ -1 +1,2 @@
 a.txt
+**.foo
diff --git a/spec/git-spec.js b/spec/git-spec.js
@@ -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)
       })
     })