rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
data/vendor/libgit2/src/ignore.c
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
#include "git2/ignore.h"
|
2
|
+
#include "common.h"
|
2
3
|
#include "ignore.h"
|
3
|
-
#include "
|
4
|
+
#include "attrcache.h"
|
4
5
|
#include "path.h"
|
5
6
|
#include "config.h"
|
6
7
|
|
@@ -9,38 +10,37 @@
|
|
9
10
|
#define GIT_IGNORE_DEFAULT_RULES ".\n..\n.git\n"
|
10
11
|
|
11
12
|
static int parse_ignore_file(
|
12
|
-
git_repository *repo,
|
13
|
+
git_repository *repo, git_attr_file *attrs, const char *data)
|
13
14
|
{
|
14
15
|
int error = 0;
|
15
|
-
git_attr_fnmatch *match = NULL;
|
16
|
-
const char *scan = NULL;
|
17
|
-
char *context = NULL;
|
18
16
|
int ignore_case = false;
|
17
|
+
const char *scan = data, *context = NULL;
|
18
|
+
git_attr_fnmatch *match = NULL;
|
19
19
|
|
20
|
-
|
21
|
-
|
22
|
-
if (parsedata != NULL)
|
23
|
-
ignore_case = ((git_ignores *)parsedata)->ignore_case;
|
24
|
-
else if (git_repository__cvar(&ignore_case, repo, GIT_CVAR_IGNORECASE) < 0)
|
25
|
-
return error;
|
20
|
+
if (git_repository__cvar(&ignore_case, repo, GIT_CVAR_IGNORECASE) < 0)
|
21
|
+
giterr_clear();
|
26
22
|
|
27
|
-
if
|
28
|
-
|
29
|
-
|
30
|
-
|
23
|
+
/* if subdir file path, convert context for file paths */
|
24
|
+
if (attrs->entry &&
|
25
|
+
git_path_root(attrs->entry->path) < 0 &&
|
26
|
+
!git__suffixcmp(attrs->entry->path, "/" GIT_IGNORE_FILE))
|
27
|
+
context = attrs->entry->path;
|
31
28
|
|
32
|
-
|
29
|
+
if (git_mutex_lock(&attrs->lock) < 0) {
|
30
|
+
giterr_set(GITERR_OS, "Failed to lock ignore file");
|
31
|
+
return -1;
|
32
|
+
}
|
33
33
|
|
34
34
|
while (!error && *scan) {
|
35
|
-
if (!match) {
|
36
|
-
|
37
|
-
|
35
|
+
if (!match && !(match = git__calloc(1, sizeof(*match)))) {
|
36
|
+
error = -1;
|
37
|
+
break;
|
38
38
|
}
|
39
39
|
|
40
|
-
match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE;
|
40
|
+
match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG;
|
41
41
|
|
42
42
|
if (!(error = git_attr_fnmatch__parse(
|
43
|
-
match,
|
43
|
+
match, &attrs->pool, context, &scan)))
|
44
44
|
{
|
45
45
|
match->flags |= GIT_ATTR_FNMATCH_IGNORE;
|
46
46
|
|
@@ -48,7 +48,7 @@ static int parse_ignore_file(
|
|
48
48
|
match->flags |= GIT_ATTR_FNMATCH_ICASE;
|
49
49
|
|
50
50
|
scan = git__next_line(scan);
|
51
|
-
error = git_vector_insert(&
|
51
|
+
error = git_vector_insert(&attrs->rules, match);
|
52
52
|
}
|
53
53
|
|
54
54
|
if (error != 0) {
|
@@ -62,32 +62,55 @@ static int parse_ignore_file(
|
|
62
62
|
}
|
63
63
|
}
|
64
64
|
|
65
|
+
git_mutex_unlock(&attrs->lock);
|
65
66
|
git__free(match);
|
66
|
-
/* restore file path used for context */
|
67
|
-
if (context)
|
68
|
-
context[strlen(context)] = '.'; /* first char of GIT_IGNORE_FILE */
|
69
67
|
|
70
68
|
return error;
|
71
69
|
}
|
72
70
|
|
73
|
-
|
74
|
-
|
71
|
+
static int push_ignore_file(
|
72
|
+
git_ignores *ignores,
|
73
|
+
git_vector *which_list,
|
74
|
+
const char *base,
|
75
|
+
const char *filename)
|
76
|
+
{
|
77
|
+
int error = 0;
|
78
|
+
git_attr_file *file = NULL;
|
79
|
+
|
80
|
+
error = git_attr_cache__get(
|
81
|
+
&file, ignores->repo, GIT_ATTR_FILE__FROM_FILE,
|
82
|
+
base, filename, parse_ignore_file);
|
83
|
+
if (error < 0)
|
84
|
+
return error;
|
85
|
+
|
86
|
+
if (file != NULL) {
|
87
|
+
if ((error = git_vector_insert(which_list, file)) < 0)
|
88
|
+
git_attr_file__free(file);
|
89
|
+
}
|
90
|
+
|
91
|
+
return error;
|
92
|
+
}
|
75
93
|
|
76
|
-
static int push_one_ignore(void *
|
94
|
+
static int push_one_ignore(void *payload, git_buf *path)
|
77
95
|
{
|
78
|
-
git_ignores *ign =
|
79
|
-
|
96
|
+
git_ignores *ign = payload;
|
97
|
+
ign->depth++;
|
98
|
+
return push_ignore_file(ign, &ign->ign_path, path->ptr, GIT_IGNORE_FILE);
|
80
99
|
}
|
81
100
|
|
82
|
-
static int get_internal_ignores(git_attr_file **
|
101
|
+
static int get_internal_ignores(git_attr_file **out, git_repository *repo)
|
83
102
|
{
|
84
103
|
int error;
|
85
104
|
|
86
|
-
if (
|
87
|
-
error
|
105
|
+
if ((error = git_attr_cache__init(repo)) < 0)
|
106
|
+
return error;
|
107
|
+
|
108
|
+
error = git_attr_cache__get(
|
109
|
+
out, repo, GIT_ATTR_FILE__IN_MEMORY, NULL, GIT_IGNORE_INTERNAL, NULL);
|
88
110
|
|
89
|
-
if
|
90
|
-
|
111
|
+
/* if internal rules list is empty, insert default rules */
|
112
|
+
if (!error && !(*out)->rules.length)
|
113
|
+
error = parse_ignore_file(repo, *out, GIT_IGNORE_DEFAULT_RULES);
|
91
114
|
|
92
115
|
return error;
|
93
116
|
}
|
@@ -100,33 +123,32 @@ int git_ignore__for_path(
|
|
100
123
|
int error = 0;
|
101
124
|
const char *workdir = git_repository_workdir(repo);
|
102
125
|
|
103
|
-
assert(ignores);
|
126
|
+
assert(ignores && path);
|
104
127
|
|
128
|
+
memset(ignores, 0, sizeof(*ignores));
|
105
129
|
ignores->repo = repo;
|
106
|
-
git_buf_init(&ignores->dir, 0);
|
107
|
-
ignores->ign_internal = NULL;
|
108
130
|
|
109
131
|
/* Read the ignore_case flag */
|
110
132
|
if ((error = git_repository__cvar(
|
111
133
|
&ignores->ignore_case, repo, GIT_CVAR_IGNORECASE)) < 0)
|
112
134
|
goto cleanup;
|
113
135
|
|
114
|
-
if ((error =
|
115
|
-
(error = git_vector_init(&ignores->ign_global, 2, NULL)) < 0 ||
|
116
|
-
(error = git_attr_cache__init(repo)) < 0)
|
136
|
+
if ((error = git_attr_cache__init(repo)) < 0)
|
117
137
|
goto cleanup;
|
118
138
|
|
119
139
|
/* given a unrooted path in a non-bare repo, resolve it */
|
120
140
|
if (workdir && git_path_root(path) < 0)
|
121
141
|
error = git_path_find_dir(&ignores->dir, path, workdir);
|
122
142
|
else
|
123
|
-
error =
|
143
|
+
error = git_buf_joinpath(&ignores->dir, path, "");
|
124
144
|
if (error < 0)
|
125
145
|
goto cleanup;
|
126
146
|
|
147
|
+
if (workdir && !git__prefixcmp(ignores->dir.ptr, workdir))
|
148
|
+
ignores->dir_root = strlen(workdir);
|
149
|
+
|
127
150
|
/* set up internals */
|
128
|
-
error = get_internal_ignores(&ignores->ign_internal, repo)
|
129
|
-
if (error < 0)
|
151
|
+
if ((error = get_internal_ignores(&ignores->ign_internal, repo)) < 0)
|
130
152
|
goto cleanup;
|
131
153
|
|
132
154
|
/* load .gitignore up the path */
|
@@ -138,14 +160,16 @@ int git_ignore__for_path(
|
|
138
160
|
}
|
139
161
|
|
140
162
|
/* load .git/info/exclude */
|
141
|
-
error = push_ignore_file(
|
163
|
+
error = push_ignore_file(
|
164
|
+
ignores, &ignores->ign_global,
|
142
165
|
git_repository_path(repo), GIT_IGNORE_FILE_INREPO);
|
143
166
|
if (error < 0)
|
144
167
|
goto cleanup;
|
145
168
|
|
146
169
|
/* load core.excludesfile */
|
147
170
|
if (git_repository_attr_cache(repo)->cfg_excl_file != NULL)
|
148
|
-
error = push_ignore_file(
|
171
|
+
error = push_ignore_file(
|
172
|
+
ignores, &ignores->ign_global, NULL,
|
149
173
|
git_repository_attr_cache(repo)->cfg_excl_file);
|
150
174
|
|
151
175
|
cleanup:
|
@@ -159,39 +183,80 @@ int git_ignore__push_dir(git_ignores *ign, const char *dir)
|
|
159
183
|
{
|
160
184
|
if (git_buf_joinpath(&ign->dir, ign->dir.ptr, dir) < 0)
|
161
185
|
return -1;
|
162
|
-
|
163
|
-
|
164
|
-
|
186
|
+
|
187
|
+
ign->depth++;
|
188
|
+
|
189
|
+
return push_ignore_file(
|
190
|
+
ign, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE);
|
165
191
|
}
|
166
192
|
|
167
193
|
int git_ignore__pop_dir(git_ignores *ign)
|
168
194
|
{
|
169
195
|
if (ign->ign_path.length > 0) {
|
170
196
|
git_attr_file *file = git_vector_last(&ign->ign_path);
|
171
|
-
|
172
|
-
|
197
|
+
const char *start = file->entry->path, *end;
|
198
|
+
|
199
|
+
/* - ign->dir looks something like "/home/user/a/b/" (or "a/b/c/d/")
|
200
|
+
* - file->path looks something like "a/b/.gitignore
|
201
|
+
*
|
202
|
+
* We are popping the last directory off ign->dir. We also want
|
203
|
+
* to remove the file from the vector if the popped directory
|
204
|
+
* matches the ignore path. We need to test if the "a/b" part of
|
205
|
+
* the file key matches the path we are about to pop.
|
206
|
+
*/
|
207
|
+
|
208
|
+
if ((end = strrchr(start, '/')) != NULL) {
|
209
|
+
size_t dirlen = (end - start) + 1;
|
210
|
+
const char *relpath = ign->dir.ptr + ign->dir_root;
|
211
|
+
size_t pathlen = ign->dir.size - ign->dir_root;
|
212
|
+
|
213
|
+
if (pathlen == dirlen && !memcmp(relpath, start, dirlen)) {
|
214
|
+
git_vector_pop(&ign->ign_path);
|
215
|
+
git_attr_file__free(file);
|
216
|
+
}
|
217
|
+
}
|
218
|
+
}
|
219
|
+
|
220
|
+
if (--ign->depth > 0) {
|
173
221
|
git_buf_rtruncate_at_char(&ign->dir, '/');
|
222
|
+
git_path_to_dir(&ign->dir);
|
174
223
|
}
|
224
|
+
|
175
225
|
return 0;
|
176
226
|
}
|
177
227
|
|
178
228
|
void git_ignore__free(git_ignores *ignores)
|
179
229
|
{
|
180
|
-
|
230
|
+
unsigned int i;
|
231
|
+
git_attr_file *file;
|
232
|
+
|
233
|
+
git_attr_file__free(ignores->ign_internal);
|
234
|
+
|
235
|
+
git_vector_foreach(&ignores->ign_path, i, file) {
|
236
|
+
git_attr_file__free(file);
|
237
|
+
ignores->ign_path.contents[i] = NULL;
|
238
|
+
}
|
181
239
|
git_vector_free(&ignores->ign_path);
|
240
|
+
|
241
|
+
git_vector_foreach(&ignores->ign_global, i, file) {
|
242
|
+
git_attr_file__free(file);
|
243
|
+
ignores->ign_global.contents[i] = NULL;
|
244
|
+
}
|
182
245
|
git_vector_free(&ignores->ign_global);
|
246
|
+
|
183
247
|
git_buf_free(&ignores->dir);
|
184
248
|
}
|
185
249
|
|
186
250
|
static bool ignore_lookup_in_rules(
|
187
|
-
|
251
|
+
int *ignored, git_attr_file *file, git_attr_path *path)
|
188
252
|
{
|
189
253
|
size_t j;
|
190
254
|
git_attr_fnmatch *match;
|
191
255
|
|
192
|
-
git_vector_rforeach(rules, j, match) {
|
256
|
+
git_vector_rforeach(&file->rules, j, match) {
|
193
257
|
if (git_attr_fnmatch__match(match, path)) {
|
194
|
-
*ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0)
|
258
|
+
*ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0) ?
|
259
|
+
GIT_IGNORE_TRUE : GIT_IGNORE_FALSE;
|
195
260
|
return true;
|
196
261
|
}
|
197
262
|
}
|
@@ -200,66 +265,66 @@ static bool ignore_lookup_in_rules(
|
|
200
265
|
}
|
201
266
|
|
202
267
|
int git_ignore__lookup(
|
203
|
-
git_ignores *ignores, const char *pathname
|
268
|
+
int *out, git_ignores *ignores, const char *pathname)
|
204
269
|
{
|
205
270
|
unsigned int i;
|
206
271
|
git_attr_file *file;
|
207
272
|
git_attr_path path;
|
208
273
|
|
274
|
+
*out = GIT_IGNORE_NOTFOUND;
|
275
|
+
|
209
276
|
if (git_attr_path__init(
|
210
277
|
&path, pathname, git_repository_workdir(ignores->repo)) < 0)
|
211
278
|
return -1;
|
212
279
|
|
213
280
|
/* first process builtins - success means path was found */
|
214
|
-
if (ignore_lookup_in_rules(
|
215
|
-
&ignores->ign_internal->rules, &path, ignored))
|
281
|
+
if (ignore_lookup_in_rules(out, ignores->ign_internal, &path))
|
216
282
|
goto cleanup;
|
217
283
|
|
218
284
|
/* next process files in the path */
|
219
285
|
git_vector_foreach(&ignores->ign_path, i, file) {
|
220
|
-
if (ignore_lookup_in_rules(
|
286
|
+
if (ignore_lookup_in_rules(out, file, &path))
|
221
287
|
goto cleanup;
|
222
288
|
}
|
223
289
|
|
224
290
|
/* last process global ignores */
|
225
291
|
git_vector_foreach(&ignores->ign_global, i, file) {
|
226
|
-
if (ignore_lookup_in_rules(
|
292
|
+
if (ignore_lookup_in_rules(out, file, &path))
|
227
293
|
goto cleanup;
|
228
294
|
}
|
229
295
|
|
230
|
-
*ignored = 0;
|
231
|
-
|
232
296
|
cleanup:
|
233
297
|
git_attr_path__free(&path);
|
234
298
|
return 0;
|
235
299
|
}
|
236
300
|
|
237
|
-
int git_ignore_add_rule(
|
238
|
-
git_repository *repo,
|
239
|
-
const char *rules)
|
301
|
+
int git_ignore_add_rule(git_repository *repo, const char *rules)
|
240
302
|
{
|
241
303
|
int error;
|
242
|
-
git_attr_file *ign_internal;
|
304
|
+
git_attr_file *ign_internal = NULL;
|
305
|
+
|
306
|
+
if ((error = get_internal_ignores(&ign_internal, repo)) < 0)
|
307
|
+
return error;
|
243
308
|
|
244
|
-
|
245
|
-
|
309
|
+
error = parse_ignore_file(repo, ign_internal, rules);
|
310
|
+
git_attr_file__free(ign_internal);
|
246
311
|
|
247
312
|
return error;
|
248
313
|
}
|
249
314
|
|
250
|
-
int git_ignore_clear_internal_rules(
|
251
|
-
git_repository *repo)
|
315
|
+
int git_ignore_clear_internal_rules(git_repository *repo)
|
252
316
|
{
|
253
317
|
int error;
|
254
318
|
git_attr_file *ign_internal;
|
255
319
|
|
256
|
-
if (
|
257
|
-
|
320
|
+
if ((error = get_internal_ignores(&ign_internal, repo)) < 0)
|
321
|
+
return error;
|
258
322
|
|
259
|
-
|
260
|
-
|
261
|
-
|
323
|
+
if (!(error = git_attr_file__clear_rules(ign_internal, true)))
|
324
|
+
error = parse_ignore_file(
|
325
|
+
repo, ign_internal, GIT_IGNORE_DEFAULT_RULES);
|
262
326
|
|
327
|
+
git_attr_file__free(ign_internal);
|
263
328
|
return error;
|
264
329
|
}
|
265
330
|
|
@@ -271,8 +336,6 @@ int git_ignore_path_is_ignored(
|
|
271
336
|
int error;
|
272
337
|
const char *workdir;
|
273
338
|
git_attr_path path;
|
274
|
-
char *tail, *end;
|
275
|
-
bool full_is_dir;
|
276
339
|
git_ignores ignores;
|
277
340
|
unsigned int i;
|
278
341
|
git_attr_file *file;
|
@@ -281,55 +344,42 @@ int git_ignore_path_is_ignored(
|
|
281
344
|
|
282
345
|
workdir = repo ? git_repository_workdir(repo) : NULL;
|
283
346
|
|
284
|
-
|
285
|
-
|
347
|
+
memset(&path, 0, sizeof(path));
|
348
|
+
memset(&ignores, 0, sizeof(ignores));
|
286
349
|
|
287
|
-
|
288
|
-
|
289
|
-
|
350
|
+
if ((error = git_attr_path__init(&path, pathname, workdir)) < 0 ||
|
351
|
+
(error = git_ignore__for_path(repo, path.path, &ignores)) < 0)
|
352
|
+
goto cleanup;
|
290
353
|
|
291
354
|
while (1) {
|
292
|
-
/* advance to next component of path */
|
293
|
-
path.basename = tail;
|
294
|
-
|
295
|
-
while (tail < end && *tail != '/') tail++;
|
296
|
-
*tail = '\0';
|
297
|
-
|
298
|
-
path.full.size = (tail - path.full.ptr);
|
299
|
-
path.is_dir = (tail == end) ? full_is_dir : true;
|
300
|
-
|
301
|
-
/* update ignores for new path fragment */
|
302
|
-
if (path.basename == path.path)
|
303
|
-
error = git_ignore__for_path(repo, path.path, &ignores);
|
304
|
-
else
|
305
|
-
error = git_ignore__push_dir(&ignores, path.basename);
|
306
|
-
if (error < 0)
|
307
|
-
break;
|
308
|
-
|
309
355
|
/* first process builtins - success means path was found */
|
310
|
-
if (ignore_lookup_in_rules(
|
311
|
-
&ignores.ign_internal->rules, &path, ignored))
|
356
|
+
if (ignore_lookup_in_rules(ignored, ignores.ign_internal, &path))
|
312
357
|
goto cleanup;
|
313
358
|
|
314
359
|
/* next process files in the path */
|
315
360
|
git_vector_foreach(&ignores.ign_path, i, file) {
|
316
|
-
if (ignore_lookup_in_rules(
|
361
|
+
if (ignore_lookup_in_rules(ignored, file, &path))
|
317
362
|
goto cleanup;
|
318
363
|
}
|
319
364
|
|
320
365
|
/* last process global ignores */
|
321
366
|
git_vector_foreach(&ignores.ign_global, i, file) {
|
322
|
-
if (ignore_lookup_in_rules(
|
367
|
+
if (ignore_lookup_in_rules(ignored, file, &path))
|
323
368
|
goto cleanup;
|
324
369
|
}
|
325
370
|
|
326
|
-
/*
|
327
|
-
if (
|
371
|
+
/* move up one directory */
|
372
|
+
if (path.basename == path.path)
|
373
|
+
break;
|
374
|
+
path.basename[-1] = '\0';
|
375
|
+
while (path.basename > path.path && *path.basename != '/')
|
376
|
+
path.basename--;
|
377
|
+
if (path.basename > path.path)
|
378
|
+
path.basename++;
|
379
|
+
path.is_dir = 1;
|
380
|
+
|
381
|
+
if ((error = git_ignore__pop_dir(&ignores)) < 0)
|
328
382
|
break;
|
329
|
-
|
330
|
-
/* reinstate divider in path */
|
331
|
-
*tail = '/';
|
332
|
-
while (*tail == '/') tail++;
|
333
383
|
}
|
334
384
|
|
335
385
|
*ignored = 0;
|
@@ -340,7 +390,6 @@ cleanup:
|
|
340
390
|
return error;
|
341
391
|
}
|
342
392
|
|
343
|
-
|
344
393
|
int git_ignore__check_pathspec_for_exact_ignores(
|
345
394
|
git_repository *repo,
|
346
395
|
git_vector *vspec,
|
data/vendor/libgit2/src/ignore.h
CHANGED
@@ -24,14 +24,17 @@
|
|
24
24
|
*/
|
25
25
|
typedef struct {
|
26
26
|
git_repository *repo;
|
27
|
-
git_buf dir;
|
27
|
+
git_buf dir; /* current directory reflected in ign_path */
|
28
28
|
git_attr_file *ign_internal;
|
29
29
|
git_vector ign_path;
|
30
30
|
git_vector ign_global;
|
31
|
+
size_t dir_root; /* offset in dir to repo root */
|
31
32
|
int ignore_case;
|
33
|
+
int depth;
|
32
34
|
} git_ignores;
|
33
35
|
|
34
|
-
extern int git_ignore__for_path(
|
36
|
+
extern int git_ignore__for_path(
|
37
|
+
git_repository *repo, const char *path, git_ignores *ign);
|
35
38
|
|
36
39
|
extern int git_ignore__push_dir(git_ignores *ign, const char *dir);
|
37
40
|
|
@@ -39,7 +42,14 @@ extern int git_ignore__pop_dir(git_ignores *ign);
|
|
39
42
|
|
40
43
|
extern void git_ignore__free(git_ignores *ign);
|
41
44
|
|
42
|
-
|
45
|
+
enum {
|
46
|
+
GIT_IGNORE_UNCHECKED = -2,
|
47
|
+
GIT_IGNORE_NOTFOUND = -1,
|
48
|
+
GIT_IGNORE_FALSE = 0,
|
49
|
+
GIT_IGNORE_TRUE = 1,
|
50
|
+
};
|
51
|
+
|
52
|
+
extern int git_ignore__lookup(int *out, git_ignores *ign, const char *path);
|
43
53
|
|
44
54
|
/* command line Git sometimes generates an error message if given a
|
45
55
|
* pathspec that contains an exact match to an ignored file (provided
|