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
data/vendor/libgit2/src/array.h
CHANGED
@@ -41,8 +41,8 @@
|
|
41
41
|
|
42
42
|
typedef git_array_t(char) git_array_generic_t;
|
43
43
|
|
44
|
-
/* use a generic array for growth
|
45
|
-
GIT_INLINE(
|
44
|
+
/* use a generic array for growth, return 0 on success */
|
45
|
+
GIT_INLINE(int) git_array_grow(void *_a, size_t item_size)
|
46
46
|
{
|
47
47
|
volatile git_array_generic_t *a = _a;
|
48
48
|
size_t new_size;
|
@@ -59,24 +59,24 @@ GIT_INLINE(void *) git_array_grow(void *_a, size_t item_size)
|
|
59
59
|
if ((new_array = git__reallocarray(a->ptr, new_size, item_size)) == NULL)
|
60
60
|
goto on_oom;
|
61
61
|
|
62
|
-
a->ptr = new_array;
|
63
|
-
|
62
|
+
a->ptr = new_array;
|
63
|
+
a->asize = new_size;
|
64
|
+
return 0;
|
64
65
|
|
65
66
|
on_oom:
|
66
67
|
git_array_clear(*a);
|
67
|
-
return
|
68
|
+
return -1;
|
68
69
|
}
|
69
70
|
|
70
71
|
#define git_array_alloc(a) \
|
71
|
-
(((a).size
|
72
|
-
|
73
|
-
((a).ptr ? &(a).ptr[(a).size++] : NULL))
|
72
|
+
(((a).size < (a).asize || git_array_grow(&(a), sizeof(*(a).ptr)) == 0) ? \
|
73
|
+
&(a).ptr[(a).size++] : (void *)NULL)
|
74
74
|
|
75
|
-
#define git_array_last(a) ((a).size ? &(a).ptr[(a).size - 1] : NULL)
|
75
|
+
#define git_array_last(a) ((a).size ? &(a).ptr[(a).size - 1] : (void *)NULL)
|
76
76
|
|
77
|
-
#define git_array_pop(a) ((a).size ? &(a).ptr[--(a).size] : NULL)
|
77
|
+
#define git_array_pop(a) ((a).size ? &(a).ptr[--(a).size] : (void *)NULL)
|
78
78
|
|
79
|
-
#define git_array_get(a, i) (((i) < (a).size) ? &(a).ptr[(i)] : NULL)
|
79
|
+
#define git_array_get(a, i) (((i) < (a).size) ? &(a).ptr[(i)] : (void *)NULL)
|
80
80
|
|
81
81
|
#define git_array_size(a) (a).size
|
82
82
|
|
data/vendor/libgit2/src/attr.c
CHANGED
@@ -36,16 +36,16 @@ git_attr_value_t git_attr_value(const char *attr)
|
|
36
36
|
static int collect_attr_files(
|
37
37
|
git_repository *repo,
|
38
38
|
git_attr_session *attr_session,
|
39
|
-
|
39
|
+
git_attr_options *opts,
|
40
40
|
const char *path,
|
41
41
|
git_vector *files);
|
42
42
|
|
43
43
|
static void release_attr_files(git_vector *files);
|
44
44
|
|
45
|
-
int
|
45
|
+
int git_attr_get_ext(
|
46
46
|
const char **value,
|
47
47
|
git_repository *repo,
|
48
|
-
|
48
|
+
git_attr_options *opts,
|
49
49
|
const char *pathname,
|
50
50
|
const char *name)
|
51
51
|
{
|
@@ -58,7 +58,10 @@ int git_attr_get(
|
|
58
58
|
git_attr_rule *rule;
|
59
59
|
git_dir_flag dir_flag = GIT_DIR_FLAG_UNKNOWN;
|
60
60
|
|
61
|
-
|
61
|
+
GIT_ASSERT_ARG(value);
|
62
|
+
GIT_ASSERT_ARG(repo);
|
63
|
+
GIT_ASSERT_ARG(name);
|
64
|
+
GIT_ERROR_CHECK_VERSION(opts, GIT_ATTR_OPTIONS_VERSION, "git_attr_options");
|
62
65
|
|
63
66
|
*value = NULL;
|
64
67
|
|
@@ -68,7 +71,7 @@ int git_attr_get(
|
|
68
71
|
if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0)
|
69
72
|
return -1;
|
70
73
|
|
71
|
-
if ((error = collect_attr_files(repo, NULL,
|
74
|
+
if ((error = collect_attr_files(repo, NULL, opts, pathname, &files)) < 0)
|
72
75
|
goto cleanup;
|
73
76
|
|
74
77
|
memset(&attr, 0, sizeof(attr));
|
@@ -95,6 +98,20 @@ cleanup:
|
|
95
98
|
return error;
|
96
99
|
}
|
97
100
|
|
101
|
+
int git_attr_get(
|
102
|
+
const char **value,
|
103
|
+
git_repository *repo,
|
104
|
+
uint32_t flags,
|
105
|
+
const char *pathname,
|
106
|
+
const char *name)
|
107
|
+
{
|
108
|
+
git_attr_options opts = GIT_ATTR_OPTIONS_INIT;
|
109
|
+
|
110
|
+
opts.flags = flags;
|
111
|
+
|
112
|
+
return git_attr_get_ext(value, repo, &opts, pathname, name);
|
113
|
+
}
|
114
|
+
|
98
115
|
|
99
116
|
typedef struct {
|
100
117
|
git_attr_name name;
|
@@ -105,7 +122,7 @@ int git_attr_get_many_with_session(
|
|
105
122
|
const char **values,
|
106
123
|
git_repository *repo,
|
107
124
|
git_attr_session *attr_session,
|
108
|
-
|
125
|
+
git_attr_options *opts,
|
109
126
|
const char *pathname,
|
110
127
|
size_t num_attr,
|
111
128
|
const char **names)
|
@@ -123,7 +140,11 @@ int git_attr_get_many_with_session(
|
|
123
140
|
if (!num_attr)
|
124
141
|
return 0;
|
125
142
|
|
126
|
-
|
143
|
+
GIT_ASSERT_ARG(values);
|
144
|
+
GIT_ASSERT_ARG(repo);
|
145
|
+
GIT_ASSERT_ARG(pathname);
|
146
|
+
GIT_ASSERT_ARG(names);
|
147
|
+
GIT_ERROR_CHECK_VERSION(opts, GIT_ATTR_OPTIONS_VERSION, "git_attr_options");
|
127
148
|
|
128
149
|
if (git_repository_is_bare(repo))
|
129
150
|
dir_flag = GIT_DIR_FLAG_FALSE;
|
@@ -131,7 +152,7 @@ int git_attr_get_many_with_session(
|
|
131
152
|
if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0)
|
132
153
|
return -1;
|
133
154
|
|
134
|
-
if ((error = collect_attr_files(repo, attr_session,
|
155
|
+
if ((error = collect_attr_files(repo, attr_session, opts, pathname, &files)) < 0)
|
135
156
|
goto cleanup;
|
136
157
|
|
137
158
|
info = git__calloc(num_attr, sizeof(attr_get_many_info));
|
@@ -185,8 +206,24 @@ int git_attr_get_many(
|
|
185
206
|
size_t num_attr,
|
186
207
|
const char **names)
|
187
208
|
{
|
209
|
+
git_attr_options opts = GIT_ATTR_OPTIONS_INIT;
|
210
|
+
|
211
|
+
opts.flags = flags;
|
212
|
+
|
188
213
|
return git_attr_get_many_with_session(
|
189
|
-
values, repo, NULL,
|
214
|
+
values, repo, NULL, &opts, pathname, num_attr, names);
|
215
|
+
}
|
216
|
+
|
217
|
+
int git_attr_get_many_ext(
|
218
|
+
const char **values,
|
219
|
+
git_repository *repo,
|
220
|
+
git_attr_options *opts,
|
221
|
+
const char *pathname,
|
222
|
+
size_t num_attr,
|
223
|
+
const char **names)
|
224
|
+
{
|
225
|
+
return git_attr_get_many_with_session(
|
226
|
+
values, repo, NULL, opts, pathname, num_attr, names);
|
190
227
|
}
|
191
228
|
|
192
229
|
int git_attr_foreach(
|
@@ -195,6 +232,20 @@ int git_attr_foreach(
|
|
195
232
|
const char *pathname,
|
196
233
|
int (*callback)(const char *name, const char *value, void *payload),
|
197
234
|
void *payload)
|
235
|
+
{
|
236
|
+
git_attr_options opts = GIT_ATTR_OPTIONS_INIT;
|
237
|
+
|
238
|
+
opts.flags = flags;
|
239
|
+
|
240
|
+
return git_attr_foreach_ext(repo, &opts, pathname, callback, payload);
|
241
|
+
}
|
242
|
+
|
243
|
+
int git_attr_foreach_ext(
|
244
|
+
git_repository *repo,
|
245
|
+
git_attr_options *opts,
|
246
|
+
const char *pathname,
|
247
|
+
int (*callback)(const char *name, const char *value, void *payload),
|
248
|
+
void *payload)
|
198
249
|
{
|
199
250
|
int error;
|
200
251
|
git_attr_path path;
|
@@ -206,7 +257,9 @@ int git_attr_foreach(
|
|
206
257
|
git_strmap *seen = NULL;
|
207
258
|
git_dir_flag dir_flag = GIT_DIR_FLAG_UNKNOWN;
|
208
259
|
|
209
|
-
|
260
|
+
GIT_ASSERT_ARG(repo);
|
261
|
+
GIT_ASSERT_ARG(callback);
|
262
|
+
GIT_ERROR_CHECK_VERSION(opts, GIT_ATTR_OPTIONS_VERSION, "git_attr_options");
|
210
263
|
|
211
264
|
if (git_repository_is_bare(repo))
|
212
265
|
dir_flag = GIT_DIR_FLAG_FALSE;
|
@@ -214,7 +267,7 @@ int git_attr_foreach(
|
|
214
267
|
if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0)
|
215
268
|
return -1;
|
216
269
|
|
217
|
-
if ((error = collect_attr_files(repo, NULL,
|
270
|
+
if ((error = collect_attr_files(repo, NULL, opts, pathname, &files)) < 0 ||
|
218
271
|
(error = git_strmap_new(&seen)) < 0)
|
219
272
|
goto cleanup;
|
220
273
|
|
@@ -247,28 +300,45 @@ cleanup:
|
|
247
300
|
return error;
|
248
301
|
}
|
249
302
|
|
250
|
-
static int
|
303
|
+
static int preload_attr_source(
|
251
304
|
git_repository *repo,
|
252
305
|
git_attr_session *attr_session,
|
253
|
-
git_attr_file_source source
|
254
|
-
const char *base,
|
255
|
-
const char *file,
|
256
|
-
bool allow_macros)
|
306
|
+
git_attr_file_source *source)
|
257
307
|
{
|
258
308
|
int error;
|
259
309
|
git_attr_file *preload = NULL;
|
260
310
|
|
261
|
-
if (!
|
311
|
+
if (!source)
|
262
312
|
return 0;
|
263
|
-
|
264
|
-
|
313
|
+
|
314
|
+
error = git_attr_cache__get(&preload, repo, attr_session, source,
|
315
|
+
git_attr_file__parse_buffer, true);
|
316
|
+
|
317
|
+
if (!error)
|
265
318
|
git_attr_file__free(preload);
|
266
319
|
|
267
320
|
return error;
|
268
321
|
}
|
269
322
|
|
323
|
+
GIT_INLINE(int) preload_attr_file(
|
324
|
+
git_repository *repo,
|
325
|
+
git_attr_session *attr_session,
|
326
|
+
const char *base,
|
327
|
+
const char *filename)
|
328
|
+
{
|
329
|
+
git_attr_file_source source = { GIT_ATTR_FILE_SOURCE_FILE };
|
330
|
+
|
331
|
+
if (!filename)
|
332
|
+
return 0;
|
333
|
+
|
334
|
+
source.base = base;
|
335
|
+
source.filename = filename;
|
336
|
+
|
337
|
+
return preload_attr_source(repo, attr_session, &source);
|
338
|
+
}
|
339
|
+
|
270
340
|
static int system_attr_file(
|
271
|
-
|
341
|
+
git_str *out,
|
272
342
|
git_attr_session *attr_session)
|
273
343
|
{
|
274
344
|
int error;
|
@@ -296,11 +366,11 @@ static int system_attr_file(
|
|
296
366
|
if (attr_session->sysdir.size == 0)
|
297
367
|
return GIT_ENOTFOUND;
|
298
368
|
|
299
|
-
/* We can safely provide a
|
300
|
-
* a consumer. This allows them to treat this as a regular `
|
301
|
-
* but their call to `
|
369
|
+
/* We can safely provide a git_str with no allocation (asize == 0) to
|
370
|
+
* a consumer. This allows them to treat this as a regular `git_str`,
|
371
|
+
* but their call to `git_str_dispose` will not attempt to free it.
|
302
372
|
*/
|
303
|
-
|
373
|
+
git_str_attach_notowned(
|
304
374
|
out, attr_session->sysdir.ptr, attr_session->sysdir.size);
|
305
375
|
return 0;
|
306
376
|
}
|
@@ -308,9 +378,12 @@ static int system_attr_file(
|
|
308
378
|
static int attr_setup(
|
309
379
|
git_repository *repo,
|
310
380
|
git_attr_session *attr_session,
|
311
|
-
|
381
|
+
git_attr_options *opts)
|
312
382
|
{
|
313
|
-
|
383
|
+
git_str system = GIT_STR_INIT, info = GIT_STR_INIT;
|
384
|
+
git_attr_file_source index_source = { GIT_ATTR_FILE_SOURCE_INDEX, NULL, GIT_ATTR_FILE, NULL };
|
385
|
+
git_attr_file_source head_source = { GIT_ATTR_FILE_SOURCE_HEAD, NULL, GIT_ATTR_FILE, NULL };
|
386
|
+
git_attr_file_source commit_source = { GIT_ATTR_FILE_SOURCE_COMMIT, NULL, GIT_ATTR_FILE, NULL };
|
314
387
|
git_index *idx = NULL;
|
315
388
|
const char *workdir;
|
316
389
|
int error = 0;
|
@@ -326,45 +399,56 @@ static int attr_setup(
|
|
326
399
|
* definitions will be available for later file parsing.
|
327
400
|
*/
|
328
401
|
|
329
|
-
if ((error = system_attr_file(&
|
330
|
-
(error = preload_attr_file(repo, attr_session,
|
331
|
-
NULL, path.ptr, true)) < 0) {
|
402
|
+
if ((error = system_attr_file(&system, attr_session)) < 0 ||
|
403
|
+
(error = preload_attr_file(repo, attr_session, NULL, system.ptr)) < 0) {
|
332
404
|
if (error != GIT_ENOTFOUND)
|
333
405
|
goto out;
|
406
|
+
|
407
|
+
error = 0;
|
334
408
|
}
|
335
409
|
|
336
|
-
if ((error = preload_attr_file(repo, attr_session,
|
337
|
-
|
410
|
+
if ((error = preload_attr_file(repo, attr_session, NULL,
|
411
|
+
git_repository_attr_cache(repo)->cfg_attr_file)) < 0)
|
338
412
|
goto out;
|
339
413
|
|
340
|
-
|
341
|
-
|
342
|
-
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
343
|
-
path.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
|
414
|
+
if ((error = git_repository__item_path(&info, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
|
415
|
+
(error = preload_attr_file(repo, attr_session, info.ptr, GIT_ATTR_FILE_INREPO)) < 0) {
|
344
416
|
if (error != GIT_ENOTFOUND)
|
345
417
|
goto out;
|
418
|
+
|
419
|
+
error = 0;
|
346
420
|
}
|
347
421
|
|
348
422
|
if ((workdir = git_repository_workdir(repo)) != NULL &&
|
349
|
-
(error = preload_attr_file(repo, attr_session,
|
350
|
-
workdir, GIT_ATTR_FILE, true)) < 0)
|
423
|
+
(error = preload_attr_file(repo, attr_session, workdir, GIT_ATTR_FILE)) < 0)
|
351
424
|
goto out;
|
352
425
|
|
353
426
|
if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
|
354
|
-
(error =
|
355
|
-
NULL, GIT_ATTR_FILE, true)) < 0)
|
427
|
+
(error = preload_attr_source(repo, attr_session, &index_source)) < 0)
|
356
428
|
goto out;
|
357
429
|
|
358
|
-
if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0 &&
|
359
|
-
(error =
|
360
|
-
NULL, GIT_ATTR_FILE, true)) < 0)
|
430
|
+
if ((opts && (opts->flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0) &&
|
431
|
+
(error = preload_attr_source(repo, attr_session, &head_source)) < 0)
|
361
432
|
goto out;
|
362
433
|
|
434
|
+
if ((opts && (opts->flags & GIT_ATTR_CHECK_INCLUDE_COMMIT) != 0)) {
|
435
|
+
#ifndef GIT_DEPRECATE_HARD
|
436
|
+
if (opts->commit_id)
|
437
|
+
commit_source.commit_id = opts->commit_id;
|
438
|
+
else
|
439
|
+
#endif
|
440
|
+
commit_source.commit_id = &opts->attr_commit_id;
|
441
|
+
|
442
|
+
if ((error = preload_attr_source(repo, attr_session, &commit_source)) < 0)
|
443
|
+
goto out;
|
444
|
+
}
|
445
|
+
|
363
446
|
if (attr_session)
|
364
447
|
attr_session->init_setup = 1;
|
365
448
|
|
366
449
|
out:
|
367
|
-
|
450
|
+
git_str_dispose(&system);
|
451
|
+
git_str_dispose(&info);
|
368
452
|
|
369
453
|
return error;
|
370
454
|
}
|
@@ -378,6 +462,9 @@ int git_attr_add_macro(
|
|
378
462
|
git_attr_rule *macro = NULL;
|
379
463
|
git_pool *pool;
|
380
464
|
|
465
|
+
GIT_ASSERT_ARG(repo);
|
466
|
+
GIT_ASSERT_ARG(name);
|
467
|
+
|
381
468
|
if ((error = git_attr_cache__init(repo)) < 0)
|
382
469
|
return error;
|
383
470
|
|
@@ -406,56 +493,62 @@ int git_attr_add_macro(
|
|
406
493
|
typedef struct {
|
407
494
|
git_repository *repo;
|
408
495
|
git_attr_session *attr_session;
|
409
|
-
|
496
|
+
git_attr_options *opts;
|
410
497
|
const char *workdir;
|
411
498
|
git_index *index;
|
412
499
|
git_vector *files;
|
413
500
|
} attr_walk_up_info;
|
414
501
|
|
415
502
|
static int attr_decide_sources(
|
416
|
-
uint32_t flags,
|
503
|
+
uint32_t flags,
|
504
|
+
bool has_wd,
|
505
|
+
bool has_index,
|
506
|
+
git_attr_file_source_t *srcs)
|
417
507
|
{
|
418
508
|
int count = 0;
|
419
509
|
|
420
510
|
switch (flags & 0x03) {
|
421
511
|
case GIT_ATTR_CHECK_FILE_THEN_INDEX:
|
422
512
|
if (has_wd)
|
423
|
-
srcs[count++] =
|
513
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_FILE;
|
424
514
|
if (has_index)
|
425
|
-
srcs[count++] =
|
515
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_INDEX;
|
426
516
|
break;
|
427
517
|
case GIT_ATTR_CHECK_INDEX_THEN_FILE:
|
428
518
|
if (has_index)
|
429
|
-
srcs[count++] =
|
519
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_INDEX;
|
430
520
|
if (has_wd)
|
431
|
-
srcs[count++] =
|
521
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_FILE;
|
432
522
|
break;
|
433
523
|
case GIT_ATTR_CHECK_INDEX_ONLY:
|
434
524
|
if (has_index)
|
435
|
-
srcs[count++] =
|
525
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_INDEX;
|
436
526
|
break;
|
437
527
|
}
|
438
528
|
|
439
529
|
if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0)
|
440
|
-
srcs[count++] =
|
530
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_HEAD;
|
531
|
+
|
532
|
+
if ((flags & GIT_ATTR_CHECK_INCLUDE_COMMIT) != 0)
|
533
|
+
srcs[count++] = GIT_ATTR_FILE_SOURCE_COMMIT;
|
441
534
|
|
442
535
|
return count;
|
443
536
|
}
|
444
537
|
|
445
|
-
static int
|
538
|
+
static int push_attr_source(
|
446
539
|
git_repository *repo,
|
447
540
|
git_attr_session *attr_session,
|
448
541
|
git_vector *list,
|
449
|
-
git_attr_file_source source,
|
450
|
-
const char *base,
|
451
|
-
const char *filename,
|
542
|
+
git_attr_file_source *source,
|
452
543
|
bool allow_macros)
|
453
544
|
{
|
454
545
|
int error = 0;
|
455
546
|
git_attr_file *file = NULL;
|
456
547
|
|
457
548
|
error = git_attr_cache__get(&file, repo, attr_session,
|
458
|
-
|
549
|
+
source,
|
550
|
+
git_attr_file__parse_buffer,
|
551
|
+
allow_macros);
|
459
552
|
|
460
553
|
if (error < 0)
|
461
554
|
return error;
|
@@ -468,20 +561,46 @@ static int push_attr_file(
|
|
468
561
|
return error;
|
469
562
|
}
|
470
563
|
|
564
|
+
GIT_INLINE(int) push_attr_file(
|
565
|
+
git_repository *repo,
|
566
|
+
git_attr_session *attr_session,
|
567
|
+
git_vector *list,
|
568
|
+
const char *base,
|
569
|
+
const char *filename)
|
570
|
+
{
|
571
|
+
git_attr_file_source source = { GIT_ATTR_FILE_SOURCE_FILE, base, filename };
|
572
|
+
return push_attr_source(repo, attr_session, list, &source, true);
|
573
|
+
}
|
574
|
+
|
471
575
|
static int push_one_attr(void *ref, const char *path)
|
472
576
|
{
|
473
577
|
attr_walk_up_info *info = (attr_walk_up_info *)ref;
|
474
|
-
|
578
|
+
git_attr_file_source_t src[GIT_ATTR_FILE_NUM_SOURCES];
|
475
579
|
int error = 0, n_src, i;
|
476
580
|
bool allow_macros;
|
477
581
|
|
478
|
-
n_src = attr_decide_sources(
|
479
|
-
|
582
|
+
n_src = attr_decide_sources(info->opts ? info->opts->flags : 0,
|
583
|
+
info->workdir != NULL,
|
584
|
+
info->index != NULL,
|
585
|
+
src);
|
586
|
+
|
480
587
|
allow_macros = info->workdir ? !strcmp(info->workdir, path) : false;
|
481
588
|
|
482
|
-
for (i = 0; !error && i < n_src; ++i)
|
483
|
-
|
484
|
-
|
589
|
+
for (i = 0; !error && i < n_src; ++i) {
|
590
|
+
git_attr_file_source source = { src[i], path, GIT_ATTR_FILE };
|
591
|
+
|
592
|
+
if (src[i] == GIT_ATTR_FILE_SOURCE_COMMIT && info->opts) {
|
593
|
+
#ifndef GIT_DEPRECATE_HARD
|
594
|
+
if (info->opts->commit_id)
|
595
|
+
source.commit_id = info->opts->commit_id;
|
596
|
+
else
|
597
|
+
#endif
|
598
|
+
source.commit_id = &info->opts->attr_commit_id;
|
599
|
+
}
|
600
|
+
|
601
|
+
error = push_attr_source(info->repo, info->attr_session, info->files,
|
602
|
+
&source, allow_macros);
|
603
|
+
}
|
485
604
|
|
486
605
|
return error;
|
487
606
|
}
|
@@ -501,43 +620,48 @@ static void release_attr_files(git_vector *files)
|
|
501
620
|
static int collect_attr_files(
|
502
621
|
git_repository *repo,
|
503
622
|
git_attr_session *attr_session,
|
504
|
-
|
623
|
+
git_attr_options *opts,
|
505
624
|
const char *path,
|
506
625
|
git_vector *files)
|
507
626
|
{
|
508
627
|
int error = 0;
|
509
|
-
|
628
|
+
git_str dir = GIT_STR_INIT, attrfile = GIT_STR_INIT;
|
510
629
|
const char *workdir = git_repository_workdir(repo);
|
511
630
|
attr_walk_up_info info = { NULL };
|
512
631
|
|
513
|
-
|
632
|
+
GIT_ASSERT(!git_fs_path_is_absolute(path));
|
633
|
+
|
634
|
+
if ((error = attr_setup(repo, attr_session, opts)) < 0)
|
514
635
|
return error;
|
515
636
|
|
516
637
|
/* Resolve path in a non-bare repo */
|
517
|
-
if (workdir != NULL)
|
518
|
-
error =
|
519
|
-
|
520
|
-
|
638
|
+
if (workdir != NULL) {
|
639
|
+
if (!(error = git_repository_workdir_path(&dir, repo, path)))
|
640
|
+
error = git_fs_path_find_dir(&dir);
|
641
|
+
}
|
642
|
+
else {
|
643
|
+
error = git_fs_path_dirname_r(&dir, path);
|
644
|
+
}
|
645
|
+
|
521
646
|
if (error < 0)
|
522
647
|
goto cleanup;
|
523
648
|
|
524
|
-
/* in
|
649
|
+
/* in precedence order highest to lowest:
|
525
650
|
* - $GIT_DIR/info/attributes
|
526
651
|
* - path components with .gitattributes
|
527
652
|
* - config core.attributesfile
|
528
653
|
* - $GIT_PREFIX/etc/gitattributes
|
529
654
|
*/
|
530
655
|
|
531
|
-
if ((error =
|
532
|
-
(error = push_attr_file(repo, attr_session, files,
|
533
|
-
attrfile.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
|
656
|
+
if ((error = git_repository__item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
|
657
|
+
(error = push_attr_file(repo, attr_session, files, attrfile.ptr, GIT_ATTR_FILE_INREPO)) < 0) {
|
534
658
|
if (error != GIT_ENOTFOUND)
|
535
659
|
goto cleanup;
|
536
660
|
}
|
537
661
|
|
538
662
|
info.repo = repo;
|
539
663
|
info.attr_session = attr_session;
|
540
|
-
info.
|
664
|
+
info.opts = opts;
|
541
665
|
info.workdir = workdir;
|
542
666
|
if (git_repository_index__weakptr(&info.index, repo) < 0)
|
543
667
|
git_error_clear(); /* no error even if there is no index */
|
@@ -546,24 +670,22 @@ static int collect_attr_files(
|
|
546
670
|
if (!strcmp(dir.ptr, "."))
|
547
671
|
error = push_one_attr(&info, "");
|
548
672
|
else
|
549
|
-
error =
|
673
|
+
error = git_fs_path_walk_up(&dir, workdir, push_one_attr, &info);
|
550
674
|
|
551
675
|
if (error < 0)
|
552
676
|
goto cleanup;
|
553
677
|
|
554
678
|
if (git_repository_attr_cache(repo)->cfg_attr_file != NULL) {
|
555
|
-
error = push_attr_file(repo, attr_session, files,
|
556
|
-
NULL, git_repository_attr_cache(repo)->cfg_attr_file, true);
|
679
|
+
error = push_attr_file(repo, attr_session, files, NULL, git_repository_attr_cache(repo)->cfg_attr_file);
|
557
680
|
if (error < 0)
|
558
681
|
goto cleanup;
|
559
682
|
}
|
560
683
|
|
561
|
-
if ((flags & GIT_ATTR_CHECK_NO_SYSTEM) == 0) {
|
684
|
+
if (!opts || (opts->flags & GIT_ATTR_CHECK_NO_SYSTEM) == 0) {
|
562
685
|
error = system_attr_file(&dir, attr_session);
|
563
686
|
|
564
687
|
if (!error)
|
565
|
-
error = push_attr_file(repo, attr_session, files,
|
566
|
-
NULL, dir.ptr, true);
|
688
|
+
error = push_attr_file(repo, attr_session, files, NULL, dir.ptr);
|
567
689
|
else if (error == GIT_ENOTFOUND)
|
568
690
|
error = 0;
|
569
691
|
}
|
@@ -571,8 +693,8 @@ static int collect_attr_files(
|
|
571
693
|
cleanup:
|
572
694
|
if (error < 0)
|
573
695
|
release_attr_files(files);
|
574
|
-
|
575
|
-
|
696
|
+
git_str_dispose(&attrfile);
|
697
|
+
git_str_dispose(&dir);
|
576
698
|
|
577
699
|
return error;
|
578
700
|
}
|