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
@@ -9,14 +9,10 @@
|
|
9
9
|
|
10
10
|
#ifndef GIT_WINHTTP
|
11
11
|
|
12
|
-
#include "git2.h"
|
13
12
|
#include "http_parser.h"
|
14
|
-
#include "buffer.h"
|
15
13
|
#include "net.h"
|
16
14
|
#include "netops.h"
|
17
|
-
#include "global.h"
|
18
15
|
#include "remote.h"
|
19
|
-
#include "git2/sys/credential.h"
|
20
16
|
#include "smart.h"
|
21
17
|
#include "auth.h"
|
22
18
|
#include "http.h"
|
@@ -26,6 +22,7 @@
|
|
26
22
|
#include "streams/tls.h"
|
27
23
|
#include "streams/socket.h"
|
28
24
|
#include "httpclient.h"
|
25
|
+
#include "git2/sys/credential.h"
|
29
26
|
|
30
27
|
bool git_http__expect_continue = false;
|
31
28
|
|
@@ -41,7 +38,8 @@ typedef struct {
|
|
41
38
|
const char *url;
|
42
39
|
const char *request_type;
|
43
40
|
const char *response_type;
|
44
|
-
unsigned
|
41
|
+
unsigned int initial : 1,
|
42
|
+
chunked : 1;
|
45
43
|
} http_service;
|
46
44
|
|
47
45
|
typedef struct {
|
@@ -73,24 +71,28 @@ static const http_service upload_pack_ls_service = {
|
|
73
71
|
GIT_HTTP_METHOD_GET, "/info/refs?service=git-upload-pack",
|
74
72
|
NULL,
|
75
73
|
"application/x-git-upload-pack-advertisement",
|
74
|
+
1,
|
76
75
|
0
|
77
76
|
};
|
78
77
|
static const http_service upload_pack_service = {
|
79
78
|
GIT_HTTP_METHOD_POST, "/git-upload-pack",
|
80
79
|
"application/x-git-upload-pack-request",
|
81
80
|
"application/x-git-upload-pack-result",
|
81
|
+
0,
|
82
82
|
0
|
83
83
|
};
|
84
84
|
static const http_service receive_pack_ls_service = {
|
85
85
|
GIT_HTTP_METHOD_GET, "/info/refs?service=git-receive-pack",
|
86
86
|
NULL,
|
87
87
|
"application/x-git-receive-pack-advertisement",
|
88
|
+
1,
|
88
89
|
0
|
89
90
|
};
|
90
91
|
static const http_service receive_pack_service = {
|
91
92
|
GIT_HTTP_METHOD_POST, "/git-receive-pack",
|
92
93
|
"application/x-git-receive-pack-request",
|
93
94
|
"application/x-git-receive-pack-result",
|
95
|
+
0,
|
94
96
|
1
|
95
97
|
};
|
96
98
|
|
@@ -105,6 +107,11 @@ static int apply_url_credentials(
|
|
105
107
|
const char *username,
|
106
108
|
const char *password)
|
107
109
|
{
|
110
|
+
GIT_ASSERT_ARG(username);
|
111
|
+
|
112
|
+
if (!password)
|
113
|
+
password = "";
|
114
|
+
|
108
115
|
if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT)
|
109
116
|
return git_credential_userpass_plaintext_new(cred, username, password);
|
110
117
|
|
@@ -139,8 +146,7 @@ static int handle_auth(
|
|
139
146
|
/* Start with URL-specified credentials, if there were any. */
|
140
147
|
if ((allowed_credtypes & GIT_CREDENTIAL_USERPASS_PLAINTEXT) &&
|
141
148
|
!server->url_cred_presented &&
|
142
|
-
server->url.username
|
143
|
-
server->url.password) {
|
149
|
+
server->url.username) {
|
144
150
|
error = apply_url_credentials(&server->cred, allowed_credtypes, server->url.username, server->url.password);
|
145
151
|
server->url_cred_presented = 1;
|
146
152
|
|
@@ -159,7 +165,7 @@ static int handle_auth(
|
|
159
165
|
|
160
166
|
if (error > 0) {
|
161
167
|
git_error_set(GIT_ERROR_HTTP, "%s authentication required but no callback set", server_type);
|
162
|
-
error =
|
168
|
+
error = GIT_EAUTH;
|
163
169
|
}
|
164
170
|
|
165
171
|
if (!error)
|
@@ -173,10 +179,11 @@ GIT_INLINE(int) handle_remote_auth(
|
|
173
179
|
git_http_response *response)
|
174
180
|
{
|
175
181
|
http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
|
182
|
+
git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
|
176
183
|
|
177
184
|
if (response->server_auth_credtypes == 0) {
|
178
185
|
git_error_set(GIT_ERROR_HTTP, "server requires authentication that we do not support");
|
179
|
-
return
|
186
|
+
return GIT_EAUTH;
|
180
187
|
}
|
181
188
|
|
182
189
|
/* Otherwise, prompt for credentials. */
|
@@ -186,8 +193,8 @@ GIT_INLINE(int) handle_remote_auth(
|
|
186
193
|
transport->owner->url,
|
187
194
|
response->server_auth_schemetypes,
|
188
195
|
response->server_auth_credtypes,
|
189
|
-
|
190
|
-
|
196
|
+
connect_opts->callbacks.credentials,
|
197
|
+
connect_opts->callbacks.payload);
|
191
198
|
}
|
192
199
|
|
193
200
|
GIT_INLINE(int) handle_proxy_auth(
|
@@ -195,23 +202,37 @@ GIT_INLINE(int) handle_proxy_auth(
|
|
195
202
|
git_http_response *response)
|
196
203
|
{
|
197
204
|
http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
|
205
|
+
git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
|
198
206
|
|
199
207
|
if (response->proxy_auth_credtypes == 0) {
|
200
208
|
git_error_set(GIT_ERROR_HTTP, "proxy requires authentication that we do not support");
|
201
|
-
return
|
209
|
+
return GIT_EAUTH;
|
202
210
|
}
|
203
211
|
|
204
212
|
/* Otherwise, prompt for credentials. */
|
205
213
|
return handle_auth(
|
206
214
|
&transport->proxy,
|
207
215
|
SERVER_TYPE_PROXY,
|
208
|
-
|
216
|
+
connect_opts->proxy_opts.url,
|
209
217
|
response->server_auth_schemetypes,
|
210
218
|
response->proxy_auth_credtypes,
|
211
|
-
|
212
|
-
|
219
|
+
connect_opts->proxy_opts.credentials,
|
220
|
+
connect_opts->proxy_opts.payload);
|
213
221
|
}
|
214
222
|
|
223
|
+
static bool allow_redirect(http_stream *stream)
|
224
|
+
{
|
225
|
+
http_subtransport *transport = OWNING_SUBTRANSPORT(stream);
|
226
|
+
|
227
|
+
switch (transport->owner->connect_opts.follow_redirects) {
|
228
|
+
case GIT_REMOTE_REDIRECT_INITIAL:
|
229
|
+
return (stream->service->initial == 1);
|
230
|
+
case GIT_REMOTE_REDIRECT_ALL:
|
231
|
+
return true;
|
232
|
+
default:
|
233
|
+
return false;
|
234
|
+
}
|
235
|
+
}
|
215
236
|
|
216
237
|
static int handle_response(
|
217
238
|
bool *complete,
|
@@ -230,7 +251,7 @@ static int handle_response(
|
|
230
251
|
return -1;
|
231
252
|
}
|
232
253
|
|
233
|
-
if (git_net_url_apply_redirect(&transport->server.url, response->location, stream->service->url) < 0) {
|
254
|
+
if (git_net_url_apply_redirect(&transport->server.url, response->location, allow_redirect(stream), stream->service->url) < 0) {
|
234
255
|
return -1;
|
235
256
|
}
|
236
257
|
|
@@ -256,7 +277,7 @@ static int handle_response(
|
|
256
277
|
} else if (response->status == GIT_HTTP_STATUS_UNAUTHORIZED ||
|
257
278
|
response->status == GIT_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED) {
|
258
279
|
git_error_set(GIT_ERROR_HTTP, "unexpected authentication failure");
|
259
|
-
return
|
280
|
+
return GIT_EAUTH;
|
260
281
|
}
|
261
282
|
|
262
283
|
if (response->status != GIT_HTTP_STATUS_OK) {
|
@@ -285,25 +306,24 @@ static int lookup_proxy(
|
|
285
306
|
bool *out_use,
|
286
307
|
http_subtransport *transport)
|
287
308
|
{
|
309
|
+
git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
|
288
310
|
const char *proxy;
|
289
311
|
git_remote *remote;
|
290
|
-
bool use_ssl;
|
291
312
|
char *config = NULL;
|
292
313
|
int error = 0;
|
293
314
|
|
294
315
|
*out_use = false;
|
295
316
|
git_net_url_dispose(&transport->proxy.url);
|
296
317
|
|
297
|
-
switch (
|
318
|
+
switch (connect_opts->proxy_opts.type) {
|
298
319
|
case GIT_PROXY_SPECIFIED:
|
299
|
-
proxy =
|
320
|
+
proxy = connect_opts->proxy_opts.url;
|
300
321
|
break;
|
301
322
|
|
302
323
|
case GIT_PROXY_AUTO:
|
303
324
|
remote = transport->owner->owner;
|
304
|
-
use_ssl = !strcmp(transport->server.url.scheme, "https");
|
305
325
|
|
306
|
-
error =
|
326
|
+
error = git_remote__http_proxy(&config, remote, &transport->server.url);
|
307
327
|
|
308
328
|
if (error || !config)
|
309
329
|
goto done;
|
@@ -346,7 +366,7 @@ static int generate_request(
|
|
346
366
|
request->credentials = transport->server.cred;
|
347
367
|
request->proxy = use_proxy ? &transport->proxy.url : NULL;
|
348
368
|
request->proxy_credentials = transport->proxy.cred;
|
349
|
-
request->custom_headers = &transport->owner->custom_headers;
|
369
|
+
request->custom_headers = &transport->owner->connect_opts.custom_headers;
|
350
370
|
|
351
371
|
if (stream->service->method == GIT_HTTP_METHOD_POST) {
|
352
372
|
request->chunked = stream->service->chunked;
|
@@ -413,11 +433,11 @@ static int http_stream_read(
|
|
413
433
|
|
414
434
|
if (stream->state == HTTP_STATE_SENDING_REQUEST) {
|
415
435
|
git_error_set(GIT_ERROR_HTTP, "too many redirects or authentication replays");
|
416
|
-
error =
|
436
|
+
error = GIT_ERROR; /* not GIT_EAUTH, because the exact cause is unclear */
|
417
437
|
goto done;
|
418
438
|
}
|
419
439
|
|
420
|
-
|
440
|
+
GIT_ASSERT(stream->state == HTTP_STATE_RECEIVING_RESPONSE);
|
421
441
|
|
422
442
|
error = git_http_client_read_body(transport->http_client, buffer, buffer_size);
|
423
443
|
|
@@ -551,11 +571,11 @@ static int http_stream_write(
|
|
551
571
|
if (stream->state == HTTP_STATE_NONE) {
|
552
572
|
git_error_set(GIT_ERROR_HTTP,
|
553
573
|
"too many redirects or authentication replays");
|
554
|
-
error =
|
574
|
+
error = GIT_ERROR; /* not GIT_EAUTH because the exact cause is unclear */
|
555
575
|
goto done;
|
556
576
|
}
|
557
577
|
|
558
|
-
|
578
|
+
GIT_ASSERT(stream->state == HTTP_STATE_SENDING_REQUEST);
|
559
579
|
|
560
580
|
error = git_http_client_send_body(transport->http_client, buffer, len);
|
561
581
|
|
@@ -589,7 +609,7 @@ static int http_stream_read_response(
|
|
589
609
|
(error = handle_response(&complete, stream, &response, false)) < 0)
|
590
610
|
goto done;
|
591
611
|
|
592
|
-
|
612
|
+
GIT_ASSERT(complete);
|
593
613
|
stream->state = HTTP_STATE_RECEIVING_RESPONSE;
|
594
614
|
}
|
595
615
|
|
@@ -634,11 +654,13 @@ static int http_action(
|
|
634
654
|
git_smart_service_t action)
|
635
655
|
{
|
636
656
|
http_subtransport *transport = GIT_CONTAINER_OF(t, http_subtransport, parent);
|
657
|
+
git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
|
637
658
|
http_stream *stream;
|
638
659
|
const http_service *service;
|
639
660
|
int error;
|
640
661
|
|
641
|
-
|
662
|
+
GIT_ASSERT_ARG(out);
|
663
|
+
GIT_ASSERT_ARG(t);
|
642
664
|
|
643
665
|
*out = NULL;
|
644
666
|
|
@@ -664,10 +686,10 @@ static int http_action(
|
|
664
686
|
if (!transport->http_client) {
|
665
687
|
git_http_client_options opts = {0};
|
666
688
|
|
667
|
-
opts.server_certificate_check_cb =
|
668
|
-
opts.server_certificate_check_payload =
|
669
|
-
opts.proxy_certificate_check_cb =
|
670
|
-
opts.proxy_certificate_check_payload =
|
689
|
+
opts.server_certificate_check_cb = connect_opts->callbacks.certificate_check;
|
690
|
+
opts.server_certificate_check_payload = connect_opts->callbacks.payload;
|
691
|
+
opts.proxy_certificate_check_cb = connect_opts->proxy_opts.certificate_check;
|
692
|
+
opts.proxy_certificate_check_payload = connect_opts->proxy_opts.payload;
|
671
693
|
|
672
694
|
if (git_http_client_new(&transport->http_client, &opts) < 0)
|
673
695
|
return -1;
|
@@ -721,7 +743,7 @@ int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *own
|
|
721
743
|
|
722
744
|
GIT_UNUSED(param);
|
723
745
|
|
724
|
-
|
746
|
+
GIT_ASSERT_ARG(out);
|
725
747
|
|
726
748
|
transport = git__calloc(sizeof(http_subtransport), 1);
|
727
749
|
GIT_ERROR_CHECK_ALLOC(transport);
|
@@ -8,21 +8,21 @@
|
|
8
8
|
#ifndef INCLUDE_transports_http_h__
|
9
9
|
#define INCLUDE_transports_http_h__
|
10
10
|
|
11
|
-
#include "
|
11
|
+
#include "settings.h"
|
12
12
|
#include "httpclient.h"
|
13
13
|
|
14
14
|
#define GIT_HTTP_REPLAY_MAX 15
|
15
15
|
|
16
16
|
extern bool git_http__expect_continue;
|
17
17
|
|
18
|
-
GIT_INLINE(int) git_http__user_agent(
|
18
|
+
GIT_INLINE(int) git_http__user_agent(git_str *buf)
|
19
19
|
{
|
20
20
|
const char *ua = git_libgit2__user_agent();
|
21
21
|
|
22
22
|
if (!ua)
|
23
23
|
ua = "libgit2 " LIBGIT2_VERSION;
|
24
24
|
|
25
|
-
return
|
25
|
+
return git_str_printf(buf, "git/2.0 (%s)", ua);
|
26
26
|
}
|
27
27
|
|
28
28
|
#endif
|