rugged 1.1.1 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/extconf.rb +2 -2
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_remote.c +17 -0
- data/ext/rugged/rugged_repo.c +3 -3
- data/lib/rugged/repository.rb +2 -2
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -271
- data/vendor/libgit2/COPYING +149 -24
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +13 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -96
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -48
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +32 -20
- data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +154 -122
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +17 -13
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +17 -4
- data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +106 -2
- data/vendor/libgit2/include/git2/blame.h +97 -43
- data/vendor/libgit2/include/git2/blob.h +33 -2
- data/vendor/libgit2/include/git2/branch.h +27 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +43 -6
- data/vendor/libgit2/include/git2/checkout.h +32 -13
- data/vendor/libgit2/include/git2/clone.h +4 -4
- data/vendor/libgit2/include/git2/commit.h +37 -19
- data/vendor/libgit2/include/git2/common.h +46 -5
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +326 -6
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +50 -121
- data/vendor/libgit2/include/git2/email.h +127 -0
- data/vendor/libgit2/include/git2/errors.h +7 -6
- data/vendor/libgit2/include/git2/filter.h +69 -18
- data/vendor/libgit2/include/git2/graph.h +21 -2
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +13 -7
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/notes.h +2 -2
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +65 -6
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/oidarray.h +5 -8
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +16 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +34 -2
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +8 -4
- data/vendor/libgit2/include/git2/remote.h +246 -46
- data/vendor/libgit2/include/git2/repository.h +25 -18
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +124 -62
- data/vendor/libgit2/include/git2/stdint.h +3 -3
- data/vendor/libgit2/include/git2/submodule.h +16 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/email.h +45 -0
- data/vendor/libgit2/include/git2/sys/filter.h +49 -28
- data/vendor/libgit2/include/git2/sys/midx.h +74 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +9 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +26 -34
- data/vendor/libgit2/include/git2/tag.h +13 -0
- data/vendor/libgit2/include/git2/tree.h +4 -17
- data/vendor/libgit2/include/git2/types.h +16 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +192 -290
- data/vendor/libgit2/src/alloc.c +21 -8
- data/vendor/libgit2/src/allocators/failalloc.c +92 -0
- data/vendor/libgit2/src/allocators/failalloc.h +23 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
- data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
- data/vendor/libgit2/src/annotated_commit.c +21 -9
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +34 -25
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +204 -82
- data/vendor/libgit2/src/attr_file.c +105 -52
- data/vendor/libgit2/src/attr_file.h +36 -15
- data/vendor/libgit2/src/attrcache.c +55 -45
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +15 -9
- data/vendor/libgit2/src/blame_git.c +2 -2
- data/vendor/libgit2/src/blob.c +76 -52
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +203 -110
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +11 -9
- data/vendor/libgit2/src/checkout.c +118 -91
- data/vendor/libgit2/src/cherrypick.c +16 -12
- data/vendor/libgit2/src/clone.c +97 -103
- data/vendor/libgit2/src/commit.c +167 -84
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +1224 -0
- data/vendor/libgit2/src/commit_graph.h +169 -0
- data/vendor/libgit2/src/commit_list.c +48 -3
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +35 -5
- data/vendor/libgit2/src/config.c +119 -64
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +120 -100
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +29 -27
- data/vendor/libgit2/src/crlf.c +36 -23
- data/vendor/libgit2/src/date.c +13 -19
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +32 -21
- data/vendor/libgit2/src/diff.c +71 -183
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +53 -51
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +31 -26
- data/vendor/libgit2/src/diff_generate.c +76 -23
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +120 -95
- data/vendor/libgit2/src/diff_stats.c +47 -34
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +7 -10
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/email.c +315 -0
- data/vendor/libgit2/src/email.h +25 -0
- data/vendor/libgit2/src/errors.c +37 -32
- data/vendor/libgit2/src/features.h.in +11 -2
- data/vendor/libgit2/src/fetch.c +77 -26
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +27 -23
- data/vendor/libgit2/src/filebuf.c +36 -34
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +278 -132
- data/vendor/libgit2/src/filter.h +46 -6
- data/vendor/libgit2/src/fs_path.c +2071 -0
- data/vendor/libgit2/src/fs_path.h +772 -0
- data/vendor/libgit2/src/futils.c +96 -90
- data/vendor/libgit2/src/futils.h +27 -15
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +5 -5
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +5 -5
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +13 -13
- data/vendor/libgit2/src/hash/sha1/openssl.c +5 -5
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +9 -11
- data/vendor/libgit2/src/hash/sha1/win32.c +21 -17
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +71 -36
- data/vendor/libgit2/src/hash.h +13 -13
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +30 -20
- data/vendor/libgit2/src/ignore.c +63 -46
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +184 -149
- data/vendor/libgit2/src/index.h +7 -4
- data/vendor/libgit2/src/indexer.c +143 -89
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +93 -73
- data/vendor/libgit2/src/iterator.h +6 -6
- data/vendor/libgit2/src/khash.h +3 -12
- data/vendor/libgit2/src/{settings.c → libgit2.c} +165 -56
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +60 -45
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +104 -61
- data/vendor/libgit2/src/merge.h +3 -15
- data/vendor/libgit2/src/merge_driver.c +21 -15
- data/vendor/libgit2/src/merge_file.c +24 -6
- data/vendor/libgit2/src/message.c +21 -8
- data/vendor/libgit2/src/midx.c +501 -18
- data/vendor/libgit2/src/midx.h +29 -2
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +405 -71
- data/vendor/libgit2/src/net.h +26 -5
- data/vendor/libgit2/src/netops.c +7 -5
- data/vendor/libgit2/src/netops.h +3 -3
- data/vendor/libgit2/src/notes.c +40 -49
- data/vendor/libgit2/src/object.c +68 -20
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +320 -80
- data/vendor/libgit2/src/odb.h +17 -3
- data/vendor/libgit2/src/odb_loose.c +96 -86
- data/vendor/libgit2/src/odb_mempack.c +19 -6
- data/vendor/libgit2/src/odb_pack.c +402 -125
- data/vendor/libgit2/src/oid.c +16 -8
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/oidarray.c +10 -1
- data/vendor/libgit2/src/pack-objects.c +90 -69
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +337 -127
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +17 -10
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +29 -13
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +26 -25
- data/vendor/libgit2/src/path.c +86 -1768
- data/vendor/libgit2/src/path.h +39 -635
- data/vendor/libgit2/src/pathspec.c +12 -12
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +14 -6
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +18 -14
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +177 -132
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +548 -222
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +107 -72
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +53 -38
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +960 -486
- data/vendor/libgit2/src/remote.h +16 -10
- data/vendor/libgit2/src/repository.c +702 -422
- data/vendor/libgit2/src/repository.h +26 -8
- data/vendor/libgit2/src/reset.c +16 -12
- data/vendor/libgit2/src/revert.c +16 -12
- data/vendor/libgit2/src/revparse.c +66 -48
- data/vendor/libgit2/src/revwalk.c +39 -22
- data/vendor/libgit2/src/runtime.c +162 -0
- data/vendor/libgit2/src/runtime.h +62 -0
- data/vendor/libgit2/src/settings.h +11 -0
- data/vendor/libgit2/src/signature.c +18 -11
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +39 -38
- data/vendor/libgit2/src/status.c +11 -5
- data/vendor/libgit2/src/{buffer.c → str.c} +459 -136
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +22 -23
- data/vendor/libgit2/src/streams/mbedtls.h +1 -1
- data/vendor/libgit2/src/streams/openssl.c +101 -201
- data/vendor/libgit2/src/streams/openssl.h +9 -1
- data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
- data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
- data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
- data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
- data/vendor/libgit2/src/streams/registry.c +5 -6
- data/vendor/libgit2/src/streams/socket.c +6 -2
- data/vendor/libgit2/src/streams/stransport.c +6 -3
- data/vendor/libgit2/src/streams/tls.c +5 -3
- data/vendor/libgit2/src/submodule.c +290 -212
- data/vendor/libgit2/src/submodule.h +10 -10
- data/vendor/libgit2/src/sysdir.c +70 -56
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +72 -34
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +84 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +3 -16
- data/vendor/libgit2/src/trace.h +17 -30
- data/vendor/libgit2/src/trailer.c +2 -2
- data/vendor/libgit2/src/transaction.c +20 -9
- data/vendor/libgit2/src/transport.c +13 -13
- data/vendor/libgit2/src/transports/auth.c +8 -10
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +23 -17
- data/vendor/libgit2/src/transports/auth_ntlm.c +20 -16
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +10 -14
- data/vendor/libgit2/src/transports/http.c +56 -34
- data/vendor/libgit2/src/transports/http.h +3 -3
- data/vendor/libgit2/src/transports/httpclient.c +106 -79
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +127 -119
- data/vendor/libgit2/src/transports/smart.c +61 -144
- data/vendor/libgit2/src/transports/smart.h +26 -32
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +68 -44
- data/vendor/libgit2/src/transports/ssh.c +100 -131
- data/vendor/libgit2/src/transports/winhttp.c +86 -82
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +150 -116
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +68 -144
- data/vendor/libgit2/src/util.h +36 -68
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +5 -3
- data/vendor/libgit2/src/win32/findfile.c +172 -114
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/map.c +1 -1
- data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
- data/vendor/libgit2/src/win32/path_w32.c +162 -33
- data/vendor/libgit2/src/win32/path_w32.h +2 -1
- data/vendor/libgit2/src/win32/posix.h +6 -7
- data/vendor/libgit2/src/win32/posix_w32.c +26 -33
- data/vendor/libgit2/src/win32/precompiled.h +0 -1
- data/vendor/libgit2/src/win32/reparse.h +4 -4
- data/vendor/libgit2/src/win32/thread.c +24 -15
- data/vendor/libgit2/src/win32/thread.h +1 -1
- data/vendor/libgit2/src/win32/w32_buffer.c +5 -6
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_common.h +18 -9
- data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
- data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -6
- data/vendor/libgit2/src/worktree.c +138 -105
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +6 -6
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +60 -24
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/buf_text.c +0 -316
- data/vendor/libgit2/src/buf_text.h +0 -122
- data/vendor/libgit2/src/buffer.h +0 -222
- data/vendor/libgit2/src/global.c +0 -363
- data/vendor/libgit2/src/global.h +0 -41
- data/vendor/libgit2/src/thread-utils.c +0 -58
- data/vendor/libgit2/src/thread-utils.h +0 -369
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
- data/vendor/libgit2/src/win32/w32_stack.c +0 -188
- data/vendor/libgit2/src/win32/w32_stack.h +0 -140
@@ -10,7 +10,6 @@
|
|
10
10
|
#include "repository.h"
|
11
11
|
#include "filebuf.h"
|
12
12
|
#include "attrcache.h"
|
13
|
-
#include "buf_text.h"
|
14
13
|
#include "git2/blob.h"
|
15
14
|
#include "git2/tree.h"
|
16
15
|
#include "blob.h"
|
@@ -34,7 +33,7 @@ static void attr_file_free(git_attr_file *file)
|
|
34
33
|
int git_attr_file__new(
|
35
34
|
git_attr_file **out,
|
36
35
|
git_attr_file_entry *entry,
|
37
|
-
git_attr_file_source source)
|
36
|
+
git_attr_file_source *source)
|
38
37
|
{
|
39
38
|
git_attr_file *attrs = git__calloc(1, sizeof(git_attr_file));
|
40
39
|
GIT_ERROR_CHECK_ALLOC(attrs);
|
@@ -48,8 +47,8 @@ int git_attr_file__new(
|
|
48
47
|
goto on_error;
|
49
48
|
|
50
49
|
GIT_REFCOUNT_INC(attrs);
|
51
|
-
attrs->entry
|
52
|
-
attrs->source
|
50
|
+
attrs->entry = entry;
|
51
|
+
memcpy(&attrs->source, source, sizeof(git_attr_file_source));
|
53
52
|
*out = attrs;
|
54
53
|
return 0;
|
55
54
|
|
@@ -109,31 +108,32 @@ int git_attr_file__load(
|
|
109
108
|
git_repository *repo,
|
110
109
|
git_attr_session *attr_session,
|
111
110
|
git_attr_file_entry *entry,
|
112
|
-
git_attr_file_source source,
|
111
|
+
git_attr_file_source *source,
|
113
112
|
git_attr_file_parser parser,
|
114
113
|
bool allow_macros)
|
115
114
|
{
|
116
115
|
int error = 0;
|
116
|
+
git_commit *commit = NULL;
|
117
117
|
git_tree *tree = NULL;
|
118
118
|
git_tree_entry *tree_entry = NULL;
|
119
119
|
git_blob *blob = NULL;
|
120
|
-
|
120
|
+
git_str content = GIT_STR_INIT;
|
121
121
|
const char *content_str;
|
122
122
|
git_attr_file *file;
|
123
123
|
struct stat st;
|
124
124
|
bool nonexistent = false;
|
125
125
|
int bom_offset;
|
126
|
-
|
126
|
+
git_str_bom_t bom;
|
127
127
|
git_oid id;
|
128
128
|
git_object_size_t blobsize;
|
129
129
|
|
130
130
|
*out = NULL;
|
131
131
|
|
132
|
-
switch (source) {
|
133
|
-
case
|
132
|
+
switch (source->type) {
|
133
|
+
case GIT_ATTR_FILE_SOURCE_MEMORY:
|
134
134
|
/* in-memory attribute file doesn't need data */
|
135
135
|
break;
|
136
|
-
case
|
136
|
+
case GIT_ATTR_FILE_SOURCE_INDEX: {
|
137
137
|
if ((error = attr_file_oid_from_index(&id, repo, entry->path)) < 0 ||
|
138
138
|
(error = git_blob_lookup(&blob, repo, &id)) < 0)
|
139
139
|
return error;
|
@@ -143,10 +143,10 @@ int git_attr_file__load(
|
|
143
143
|
blobsize = git_blob_rawsize(blob);
|
144
144
|
|
145
145
|
GIT_ERROR_CHECK_BLOBSIZE(blobsize);
|
146
|
-
|
146
|
+
git_str_put(&content, git_blob_rawcontent(blob), (size_t)blobsize);
|
147
147
|
break;
|
148
148
|
}
|
149
|
-
case
|
149
|
+
case GIT_ATTR_FILE_SOURCE_FILE: {
|
150
150
|
int fd = -1;
|
151
151
|
|
152
152
|
/* For open or read errors, pretend that we got ENOTFOUND. */
|
@@ -163,10 +163,32 @@ int git_attr_file__load(
|
|
163
163
|
|
164
164
|
break;
|
165
165
|
}
|
166
|
-
case
|
167
|
-
|
168
|
-
|
169
|
-
|
166
|
+
case GIT_ATTR_FILE_SOURCE_HEAD:
|
167
|
+
case GIT_ATTR_FILE_SOURCE_COMMIT: {
|
168
|
+
if (source->type == GIT_ATTR_FILE_SOURCE_COMMIT) {
|
169
|
+
if ((error = git_commit_lookup(&commit, repo, source->commit_id)) < 0 ||
|
170
|
+
(error = git_commit_tree(&tree, commit)) < 0)
|
171
|
+
goto cleanup;
|
172
|
+
} else {
|
173
|
+
if ((error = git_repository_head_tree(&tree, repo)) < 0)
|
174
|
+
goto cleanup;
|
175
|
+
}
|
176
|
+
|
177
|
+
if ((error = git_tree_entry_bypath(&tree_entry, tree, entry->path)) < 0) {
|
178
|
+
/*
|
179
|
+
* If the attributes file does not exist, we can
|
180
|
+
* cache an empty file for this commit to prevent
|
181
|
+
* needless future lookups.
|
182
|
+
*/
|
183
|
+
if (error == GIT_ENOTFOUND) {
|
184
|
+
error = 0;
|
185
|
+
break;
|
186
|
+
}
|
187
|
+
|
188
|
+
goto cleanup;
|
189
|
+
}
|
190
|
+
|
191
|
+
if ((error = git_blob_lookup(&blob, repo, git_tree_entry_id(tree_entry))) < 0)
|
170
192
|
goto cleanup;
|
171
193
|
|
172
194
|
/*
|
@@ -176,14 +198,14 @@ int git_attr_file__load(
|
|
176
198
|
blobsize = git_blob_rawsize(blob);
|
177
199
|
|
178
200
|
GIT_ERROR_CHECK_BLOBSIZE(blobsize);
|
179
|
-
if ((error =
|
201
|
+
if ((error = git_str_put(&content,
|
180
202
|
git_blob_rawcontent(blob), (size_t)blobsize)) < 0)
|
181
203
|
goto cleanup;
|
182
204
|
|
183
205
|
break;
|
184
206
|
}
|
185
207
|
default:
|
186
|
-
git_error_set(GIT_ERROR_INVALID, "unknown file source %d", source);
|
208
|
+
git_error_set(GIT_ERROR_INVALID, "unknown file source %d", source->type);
|
187
209
|
return -1;
|
188
210
|
}
|
189
211
|
|
@@ -191,10 +213,10 @@ int git_attr_file__load(
|
|
191
213
|
goto cleanup;
|
192
214
|
|
193
215
|
/* advance over a UTF8 BOM */
|
194
|
-
content_str =
|
195
|
-
bom_offset =
|
216
|
+
content_str = git_str_cstr(&content);
|
217
|
+
bom_offset = git_str_detect_bom(&bom, &content);
|
196
218
|
|
197
|
-
if (bom ==
|
219
|
+
if (bom == GIT_STR_BOM_UTF8)
|
198
220
|
content_str += bom_offset;
|
199
221
|
|
200
222
|
/* store the key of the attr_reader; don't bother with cache
|
@@ -211,11 +233,13 @@ int git_attr_file__load(
|
|
211
233
|
/* write cache breakers */
|
212
234
|
if (nonexistent)
|
213
235
|
file->nonexistent = 1;
|
214
|
-
else if (source ==
|
236
|
+
else if (source->type == GIT_ATTR_FILE_SOURCE_INDEX)
|
215
237
|
git_oid_cpy(&file->cache_data.oid, git_blob_id(blob));
|
216
|
-
else if (source ==
|
238
|
+
else if (source->type == GIT_ATTR_FILE_SOURCE_HEAD)
|
217
239
|
git_oid_cpy(&file->cache_data.oid, git_tree_id(tree));
|
218
|
-
else if (source ==
|
240
|
+
else if (source->type == GIT_ATTR_FILE_SOURCE_COMMIT)
|
241
|
+
git_oid_cpy(&file->cache_data.oid, git_tree_id(tree));
|
242
|
+
else if (source->type == GIT_ATTR_FILE_SOURCE_FILE)
|
219
243
|
git_futils_filestamp_set_from_stat(&file->cache_data.stamp, &st);
|
220
244
|
/* else always cacheable */
|
221
245
|
|
@@ -225,7 +249,8 @@ cleanup:
|
|
225
249
|
git_blob_free(blob);
|
226
250
|
git_tree_entry_free(tree_entry);
|
227
251
|
git_tree_free(tree);
|
228
|
-
|
252
|
+
git_commit_free(commit);
|
253
|
+
git_str_dispose(&content);
|
229
254
|
|
230
255
|
return error;
|
231
256
|
}
|
@@ -233,7 +258,8 @@ cleanup:
|
|
233
258
|
int git_attr_file__out_of_date(
|
234
259
|
git_repository *repo,
|
235
260
|
git_attr_session *attr_session,
|
236
|
-
git_attr_file *file
|
261
|
+
git_attr_file *file,
|
262
|
+
git_attr_file_source *source)
|
237
263
|
{
|
238
264
|
if (!file)
|
239
265
|
return 1;
|
@@ -246,15 +272,15 @@ int git_attr_file__out_of_date(
|
|
246
272
|
else if (file->nonexistent)
|
247
273
|
return 1;
|
248
274
|
|
249
|
-
switch (file->source) {
|
250
|
-
case
|
275
|
+
switch (file->source.type) {
|
276
|
+
case GIT_ATTR_FILE_SOURCE_MEMORY:
|
251
277
|
return 0;
|
252
278
|
|
253
|
-
case
|
279
|
+
case GIT_ATTR_FILE_SOURCE_FILE:
|
254
280
|
return git_futils_filestamp_check(
|
255
281
|
&file->cache_data.stamp, file->entry->fullpath);
|
256
282
|
|
257
|
-
case
|
283
|
+
case GIT_ATTR_FILE_SOURCE_INDEX: {
|
258
284
|
int error;
|
259
285
|
git_oid id;
|
260
286
|
|
@@ -265,21 +291,41 @@ int git_attr_file__out_of_date(
|
|
265
291
|
return (git_oid__cmp(&file->cache_data.oid, &id) != 0);
|
266
292
|
}
|
267
293
|
|
268
|
-
case
|
269
|
-
git_tree *tree;
|
294
|
+
case GIT_ATTR_FILE_SOURCE_HEAD: {
|
295
|
+
git_tree *tree = NULL;
|
296
|
+
int error = git_repository_head_tree(&tree, repo);
|
297
|
+
|
298
|
+
if (error < 0)
|
299
|
+
return error;
|
300
|
+
|
301
|
+
error = (git_oid__cmp(&file->cache_data.oid, git_tree_id(tree)) != 0);
|
302
|
+
|
303
|
+
git_tree_free(tree);
|
304
|
+
return error;
|
305
|
+
}
|
306
|
+
|
307
|
+
case GIT_ATTR_FILE_SOURCE_COMMIT: {
|
308
|
+
git_commit *commit = NULL;
|
309
|
+
git_tree *tree = NULL;
|
270
310
|
int error;
|
271
311
|
|
272
|
-
if ((error =
|
312
|
+
if ((error = git_commit_lookup(&commit, repo, source->commit_id)) < 0)
|
313
|
+
return error;
|
314
|
+
|
315
|
+
error = git_commit_tree(&tree, commit);
|
316
|
+
git_commit_free(commit);
|
317
|
+
|
318
|
+
if (error < 0)
|
273
319
|
return error;
|
274
320
|
|
275
|
-
error = git_oid__cmp(&file->cache_data.oid, git_tree_id(tree));
|
321
|
+
error = (git_oid__cmp(&file->cache_data.oid, git_tree_id(tree)) != 0);
|
276
322
|
|
277
323
|
git_tree_free(tree);
|
278
324
|
return error;
|
279
325
|
}
|
280
326
|
|
281
327
|
default:
|
282
|
-
git_error_set(GIT_ERROR_INVALID, "invalid file type %d", file->source);
|
328
|
+
git_error_set(GIT_ERROR_INVALID, "invalid file type %d", file->source.type);
|
283
329
|
return -1;
|
284
330
|
}
|
285
331
|
}
|
@@ -299,7 +345,7 @@ int git_attr_file__parse_buffer(
|
|
299
345
|
int error = 0;
|
300
346
|
|
301
347
|
/* If subdir file path, convert context for file paths */
|
302
|
-
if (attrs->entry &&
|
348
|
+
if (attrs->entry && git_fs_path_root(attrs->entry->path) < 0 &&
|
303
349
|
!git__suffixcmp(attrs->entry->path, "/" GIT_ATTR_FILE))
|
304
350
|
context = attrs->entry->path;
|
305
351
|
|
@@ -351,7 +397,9 @@ uint32_t git_attr_file__name_hash(const char *name)
|
|
351
397
|
{
|
352
398
|
uint32_t h = 5381;
|
353
399
|
int c;
|
354
|
-
|
400
|
+
|
401
|
+
GIT_ASSERT_ARG(name);
|
402
|
+
|
355
403
|
while ((c = (int)*name++) != 0)
|
356
404
|
h = ((h << 5) + h) + c;
|
357
405
|
return h;
|
@@ -387,7 +435,8 @@ int git_attr_file__lookup_one(
|
|
387
435
|
|
388
436
|
int git_attr_file__load_standalone(git_attr_file **out, const char *path)
|
389
437
|
{
|
390
|
-
|
438
|
+
git_str content = GIT_STR_INIT;
|
439
|
+
git_attr_file_source source = { GIT_ATTR_FILE_SOURCE_FILE };
|
391
440
|
git_attr_file *file = NULL;
|
392
441
|
int error;
|
393
442
|
|
@@ -399,16 +448,16 @@ int git_attr_file__load_standalone(git_attr_file **out, const char *path)
|
|
399
448
|
* don't have to free it - freeing file+pool will free cache entry, too.
|
400
449
|
*/
|
401
450
|
|
402
|
-
if ((error = git_attr_file__new(&file, NULL,
|
451
|
+
if ((error = git_attr_file__new(&file, NULL, &source)) < 0 ||
|
403
452
|
(error = git_attr_file__parse_buffer(NULL, file, content.ptr, true)) < 0 ||
|
404
|
-
(error = git_attr_cache__alloc_file_entry(&file->entry, NULL, path, &file->pool)) < 0)
|
453
|
+
(error = git_attr_cache__alloc_file_entry(&file->entry, NULL, NULL, path, &file->pool)) < 0)
|
405
454
|
goto out;
|
406
455
|
|
407
456
|
*out = file;
|
408
457
|
out:
|
409
458
|
if (error < 0)
|
410
459
|
git_attr_file__free(file);
|
411
|
-
|
460
|
+
git_str_dispose(&content);
|
412
461
|
|
413
462
|
return error;
|
414
463
|
}
|
@@ -501,14 +550,17 @@ git_attr_assignment *git_attr_rule__lookup_assignment(
|
|
501
550
|
}
|
502
551
|
|
503
552
|
int git_attr_path__init(
|
504
|
-
git_attr_path *info,
|
553
|
+
git_attr_path *info,
|
554
|
+
const char *path,
|
555
|
+
const char *base,
|
556
|
+
git_dir_flag dir_flag)
|
505
557
|
{
|
506
558
|
ssize_t root;
|
507
559
|
|
508
560
|
/* build full path as best we can */
|
509
|
-
|
561
|
+
git_str_init(&info->full, 0);
|
510
562
|
|
511
|
-
if (
|
563
|
+
if (git_fs_path_join_unrooted(&info->full, path, base, &root) < 0)
|
512
564
|
return -1;
|
513
565
|
|
514
566
|
info->path = info->full.ptr + root;
|
@@ -544,7 +596,7 @@ int git_attr_path__init(
|
|
544
596
|
|
545
597
|
case GIT_DIR_FLAG_UNKNOWN:
|
546
598
|
default:
|
547
|
-
info->is_dir = (int)
|
599
|
+
info->is_dir = (int)git_fs_path_isdir(info->full.ptr);
|
548
600
|
break;
|
549
601
|
}
|
550
602
|
|
@@ -553,7 +605,7 @@ int git_attr_path__init(
|
|
553
605
|
|
554
606
|
void git_attr_path__free(git_attr_path *info)
|
555
607
|
{
|
556
|
-
|
608
|
+
git_str_dispose(&info->full);
|
557
609
|
info->path = NULL;
|
558
610
|
info->basename = NULL;
|
559
611
|
}
|
@@ -660,7 +712,8 @@ int git_attr_fnmatch__parse(
|
|
660
712
|
int slash_count, allow_space;
|
661
713
|
bool escaped;
|
662
714
|
|
663
|
-
|
715
|
+
GIT_ASSERT_ARG(spec);
|
716
|
+
GIT_ASSERT_ARG(base && *base);
|
664
717
|
|
665
718
|
if (parse_optimized_patterns(spec, pool, *base))
|
666
719
|
return 0;
|
@@ -828,7 +881,7 @@ int git_attr_assignment__parse(
|
|
828
881
|
const char *scan = *base;
|
829
882
|
git_attr_assignment *assign = NULL;
|
830
883
|
|
831
|
-
|
884
|
+
GIT_ASSERT_ARG(assigns && !assigns->length);
|
832
885
|
|
833
886
|
git_vector_set_cmp(assigns, sort_by_hash_and_name);
|
834
887
|
|
@@ -954,10 +1007,10 @@ void git_attr_rule__free(git_attr_rule *rule)
|
|
954
1007
|
|
955
1008
|
int git_attr_session__init(git_attr_session *session, git_repository *repo)
|
956
1009
|
{
|
957
|
-
|
1010
|
+
GIT_ASSERT_ARG(repo);
|
958
1011
|
|
959
1012
|
memset(session, 0, sizeof(*session));
|
960
|
-
session->key =
|
1013
|
+
session->key = git_atomic32_inc(&repo->attr_session_key);
|
961
1014
|
|
962
1015
|
return 0;
|
963
1016
|
}
|
@@ -967,8 +1020,8 @@ void git_attr_session__free(git_attr_session *session)
|
|
967
1020
|
if (!session)
|
968
1021
|
return;
|
969
1022
|
|
970
|
-
|
971
|
-
|
1023
|
+
git_str_dispose(&session->sysdir);
|
1024
|
+
git_str_dispose(&session->tmp);
|
972
1025
|
|
973
1026
|
memset(session, 0, sizeof(git_attr_session));
|
974
1027
|
}
|
@@ -13,7 +13,7 @@
|
|
13
13
|
#include "git2/attr.h"
|
14
14
|
#include "vector.h"
|
15
15
|
#include "pool.h"
|
16
|
-
#include "
|
16
|
+
#include "str.h"
|
17
17
|
#include "futils.h"
|
18
18
|
|
19
19
|
#define GIT_ATTR_FILE ".gitattributes"
|
@@ -37,12 +37,31 @@
|
|
37
37
|
(GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG | GIT_ATTR_FNMATCH_ALLOWMACRO)
|
38
38
|
|
39
39
|
typedef enum {
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
40
|
+
GIT_ATTR_FILE_SOURCE_MEMORY = 0,
|
41
|
+
GIT_ATTR_FILE_SOURCE_FILE = 1,
|
42
|
+
GIT_ATTR_FILE_SOURCE_INDEX = 2,
|
43
|
+
GIT_ATTR_FILE_SOURCE_HEAD = 3,
|
44
|
+
GIT_ATTR_FILE_SOURCE_COMMIT = 4,
|
44
45
|
|
45
|
-
GIT_ATTR_FILE_NUM_SOURCES
|
46
|
+
GIT_ATTR_FILE_NUM_SOURCES = 5
|
47
|
+
} git_attr_file_source_t;
|
48
|
+
|
49
|
+
typedef struct {
|
50
|
+
/* The source location for the attribute file. */
|
51
|
+
git_attr_file_source_t type;
|
52
|
+
|
53
|
+
/*
|
54
|
+
* The filename of the attribute file to read (relative to the
|
55
|
+
* given base path).
|
56
|
+
*/
|
57
|
+
const char *base;
|
58
|
+
const char *filename;
|
59
|
+
|
60
|
+
/*
|
61
|
+
* The commit ID when the given source type is a commit (or NULL
|
62
|
+
* for the repository's HEAD commit.)
|
63
|
+
*/
|
64
|
+
git_oid *commit_id;
|
46
65
|
} git_attr_file_source;
|
47
66
|
|
48
67
|
extern const char *git_attr__true;
|
@@ -99,7 +118,7 @@ struct git_attr_file_entry {
|
|
99
118
|
};
|
100
119
|
|
101
120
|
typedef struct {
|
102
|
-
|
121
|
+
git_str full;
|
103
122
|
char *path;
|
104
123
|
char *basename;
|
105
124
|
int is_dir;
|
@@ -113,8 +132,8 @@ typedef struct {
|
|
113
132
|
int key;
|
114
133
|
unsigned int init_setup:1,
|
115
134
|
init_sysdir:1;
|
116
|
-
|
117
|
-
|
135
|
+
git_str sysdir;
|
136
|
+
git_str tmp;
|
118
137
|
} git_attr_session;
|
119
138
|
|
120
139
|
extern int git_attr_session__init(git_attr_session *attr_session, git_repository *repo);
|
@@ -124,7 +143,7 @@ extern int git_attr_get_many_with_session(
|
|
124
143
|
const char **values_out,
|
125
144
|
git_repository *repo,
|
126
145
|
git_attr_session *attr_session,
|
127
|
-
|
146
|
+
git_attr_options *opts,
|
128
147
|
const char *path,
|
129
148
|
size_t num_attr,
|
130
149
|
const char **names);
|
@@ -142,7 +161,7 @@ typedef int (*git_attr_file_parser)(
|
|
142
161
|
int git_attr_file__new(
|
143
162
|
git_attr_file **out,
|
144
163
|
git_attr_file_entry *entry,
|
145
|
-
git_attr_file_source source);
|
164
|
+
git_attr_file_source *source);
|
146
165
|
|
147
166
|
void git_attr_file__free(git_attr_file *file);
|
148
167
|
|
@@ -151,7 +170,7 @@ int git_attr_file__load(
|
|
151
170
|
git_repository *repo,
|
152
171
|
git_attr_session *attr_session,
|
153
172
|
git_attr_file_entry *ce,
|
154
|
-
git_attr_file_source source,
|
173
|
+
git_attr_file_source *source,
|
155
174
|
git_attr_file_parser parser,
|
156
175
|
bool allow_macros);
|
157
176
|
|
@@ -159,7 +178,7 @@ int git_attr_file__load_standalone(
|
|
159
178
|
git_attr_file **out, const char *path);
|
160
179
|
|
161
180
|
int git_attr_file__out_of_date(
|
162
|
-
git_repository *repo, git_attr_session *session, git_attr_file *file);
|
181
|
+
git_repository *repo, git_attr_session *session, git_attr_file *file, git_attr_file_source *source);
|
163
182
|
|
164
183
|
int git_attr_file__parse_buffer(
|
165
184
|
git_repository *repo, git_attr_file *attrs, const char *data, bool allow_macros);
|
@@ -207,8 +226,10 @@ extern git_attr_assignment *git_attr_rule__lookup_assignment(
|
|
207
226
|
typedef enum { GIT_DIR_FLAG_TRUE = 1, GIT_DIR_FLAG_FALSE = 0, GIT_DIR_FLAG_UNKNOWN = -1 } git_dir_flag;
|
208
227
|
|
209
228
|
extern int git_attr_path__init(
|
210
|
-
git_attr_path *
|
211
|
-
|
229
|
+
git_attr_path *out,
|
230
|
+
const char *path,
|
231
|
+
const char *base,
|
232
|
+
git_dir_flag is_dir);
|
212
233
|
extern void git_attr_path__free(git_attr_path *info);
|
213
234
|
|
214
235
|
extern int git_attr_assignment__parse(
|