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
@@ -23,7 +23,7 @@
|
|
23
23
|
typedef enum {
|
24
24
|
TRANSACTION_NONE,
|
25
25
|
TRANSACTION_REFS,
|
26
|
-
TRANSACTION_CONFIG
|
26
|
+
TRANSACTION_CONFIG
|
27
27
|
} transaction_t;
|
28
28
|
|
29
29
|
typedef struct {
|
@@ -57,7 +57,9 @@ struct git_transaction {
|
|
57
57
|
int git_transaction_config_new(git_transaction **out, git_config *cfg)
|
58
58
|
{
|
59
59
|
git_transaction *tx;
|
60
|
-
|
60
|
+
|
61
|
+
GIT_ASSERT_ARG(out);
|
62
|
+
GIT_ASSERT_ARG(cfg);
|
61
63
|
|
62
64
|
tx = git__calloc(1, sizeof(git_transaction));
|
63
65
|
GIT_ERROR_CHECK_ALLOC(tx);
|
@@ -74,7 +76,8 @@ int git_transaction_new(git_transaction **out, git_repository *repo)
|
|
74
76
|
git_pool pool;
|
75
77
|
git_transaction *tx = NULL;
|
76
78
|
|
77
|
-
|
79
|
+
GIT_ASSERT_ARG(out);
|
80
|
+
GIT_ASSERT_ARG(repo);
|
78
81
|
|
79
82
|
if ((error = git_pool_init(&pool, 1)) < 0)
|
80
83
|
goto on_error;
|
@@ -109,7 +112,8 @@ int git_transaction_lock_ref(git_transaction *tx, const char *refname)
|
|
109
112
|
int error;
|
110
113
|
transaction_node *node;
|
111
114
|
|
112
|
-
|
115
|
+
GIT_ASSERT_ARG(tx);
|
116
|
+
GIT_ASSERT_ARG(refname);
|
113
117
|
|
114
118
|
node = git_pool_mallocz(&tx->pool, sizeof(transaction_node));
|
115
119
|
GIT_ERROR_CHECK_ALLOC(node);
|
@@ -176,7 +180,9 @@ int git_transaction_set_target(git_transaction *tx, const char *refname, const g
|
|
176
180
|
int error;
|
177
181
|
transaction_node *node;
|
178
182
|
|
179
|
-
|
183
|
+
GIT_ASSERT_ARG(tx);
|
184
|
+
GIT_ASSERT_ARG(refname);
|
185
|
+
GIT_ASSERT_ARG(target);
|
180
186
|
|
181
187
|
if ((error = find_locked(&node, tx, refname)) < 0)
|
182
188
|
return error;
|
@@ -195,7 +201,9 @@ int git_transaction_set_symbolic_target(git_transaction *tx, const char *refname
|
|
195
201
|
int error;
|
196
202
|
transaction_node *node;
|
197
203
|
|
198
|
-
|
204
|
+
GIT_ASSERT_ARG(tx);
|
205
|
+
GIT_ASSERT_ARG(refname);
|
206
|
+
GIT_ASSERT_ARG(target);
|
199
207
|
|
200
208
|
if ((error = find_locked(&node, tx, refname)) < 0)
|
201
209
|
return error;
|
@@ -272,7 +280,9 @@ int git_transaction_set_reflog(git_transaction *tx, const char *refname, const g
|
|
272
280
|
int error;
|
273
281
|
transaction_node *node;
|
274
282
|
|
275
|
-
|
283
|
+
GIT_ASSERT_ARG(tx);
|
284
|
+
GIT_ASSERT_ARG(refname);
|
285
|
+
GIT_ASSERT_ARG(reflog);
|
276
286
|
|
277
287
|
if ((error = find_locked(&node, tx, refname)) < 0)
|
278
288
|
return error;
|
@@ -320,7 +330,7 @@ int git_transaction_commit(git_transaction *tx)
|
|
320
330
|
transaction_node *node;
|
321
331
|
int error = 0;
|
322
332
|
|
323
|
-
|
333
|
+
GIT_ASSERT_ARG(tx);
|
324
334
|
|
325
335
|
if (tx->type == TRANSACTION_CONFIG) {
|
326
336
|
error = git_config_unlock(tx->cfg, true);
|
@@ -355,7 +365,8 @@ void git_transaction_free(git_transaction *tx)
|
|
355
365
|
transaction_node *node;
|
356
366
|
git_pool pool;
|
357
367
|
|
358
|
-
|
368
|
+
if (!tx)
|
369
|
+
return;
|
359
370
|
|
360
371
|
if (tx->type == TRANSACTION_CONFIG) {
|
361
372
|
if (tx->cfg) {
|
@@ -12,7 +12,7 @@
|
|
12
12
|
#include "git2/net.h"
|
13
13
|
#include "git2/transport.h"
|
14
14
|
#include "git2/sys/transport.h"
|
15
|
-
#include "
|
15
|
+
#include "fs_path.h"
|
16
16
|
|
17
17
|
typedef struct transport_definition {
|
18
18
|
char *prefix;
|
@@ -82,7 +82,7 @@ static int transport_find_fn(
|
|
82
82
|
* to a directory and if so assume local path, else assume SSH */
|
83
83
|
|
84
84
|
/* Check to see if the path points to a file on the local file system */
|
85
|
-
if (!definition &&
|
85
|
+
if (!definition && git_fs_path_exists(url) && git_fs_path_isdir(url))
|
86
86
|
definition = &local_transport_definition;
|
87
87
|
#endif
|
88
88
|
|
@@ -98,7 +98,7 @@ static int transport_find_fn(
|
|
98
98
|
|
99
99
|
#ifndef GIT_WIN32
|
100
100
|
/* Check to see if the path points to a file on the local file system */
|
101
|
-
if (!definition &&
|
101
|
+
if (!definition && git_fs_path_exists(url) && git_fs_path_isdir(url))
|
102
102
|
definition = &local_transport_definition;
|
103
103
|
#endif
|
104
104
|
|
@@ -143,15 +143,15 @@ int git_transport_register(
|
|
143
143
|
git_transport_cb cb,
|
144
144
|
void *param)
|
145
145
|
{
|
146
|
-
|
146
|
+
git_str prefix = GIT_STR_INIT;
|
147
147
|
transport_definition *d, *definition = NULL;
|
148
148
|
size_t i;
|
149
149
|
int error = 0;
|
150
150
|
|
151
|
-
|
152
|
-
|
151
|
+
GIT_ASSERT_ARG(scheme);
|
152
|
+
GIT_ASSERT_ARG(cb);
|
153
153
|
|
154
|
-
if ((error =
|
154
|
+
if ((error = git_str_printf(&prefix, "%s://", scheme)) < 0)
|
155
155
|
goto on_error;
|
156
156
|
|
157
157
|
git_vector_foreach(&custom_transports, i, d) {
|
@@ -164,7 +164,7 @@ int git_transport_register(
|
|
164
164
|
definition = git__calloc(1, sizeof(transport_definition));
|
165
165
|
GIT_ERROR_CHECK_ALLOC(definition);
|
166
166
|
|
167
|
-
definition->prefix =
|
167
|
+
definition->prefix = git_str_detach(&prefix);
|
168
168
|
definition->fn = cb;
|
169
169
|
definition->param = param;
|
170
170
|
|
@@ -174,21 +174,21 @@ int git_transport_register(
|
|
174
174
|
return 0;
|
175
175
|
|
176
176
|
on_error:
|
177
|
-
|
177
|
+
git_str_dispose(&prefix);
|
178
178
|
git__free(definition);
|
179
179
|
return error;
|
180
180
|
}
|
181
181
|
|
182
182
|
int git_transport_unregister(const char *scheme)
|
183
183
|
{
|
184
|
-
|
184
|
+
git_str prefix = GIT_STR_INIT;
|
185
185
|
transport_definition *d;
|
186
186
|
size_t i;
|
187
187
|
int error = 0;
|
188
188
|
|
189
|
-
|
189
|
+
GIT_ASSERT_ARG(scheme);
|
190
190
|
|
191
|
-
if ((error =
|
191
|
+
if ((error = git_str_printf(&prefix, "%s://", scheme)) < 0)
|
192
192
|
goto done;
|
193
193
|
|
194
194
|
git_vector_foreach(&custom_transports, i, d) {
|
@@ -210,7 +210,7 @@ int git_transport_unregister(const char *scheme)
|
|
210
210
|
error = GIT_ENOTFOUND;
|
211
211
|
|
212
212
|
done:
|
213
|
-
|
213
|
+
git_str_dispose(&prefix);
|
214
214
|
return error;
|
215
215
|
}
|
216
216
|
|
@@ -7,18 +7,16 @@
|
|
7
7
|
|
8
8
|
#include "auth.h"
|
9
9
|
|
10
|
-
#include "git2.h"
|
11
|
-
#include "buffer.h"
|
12
10
|
#include "git2/sys/credential.h"
|
13
11
|
|
14
12
|
static int basic_next_token(
|
15
|
-
|
13
|
+
git_str *out,
|
16
14
|
git_http_auth_context *ctx,
|
17
15
|
git_credential *c)
|
18
16
|
{
|
19
17
|
git_credential_userpass_plaintext *cred;
|
20
|
-
|
21
|
-
int error =
|
18
|
+
git_str raw = GIT_STR_INIT;
|
19
|
+
int error = GIT_EAUTH;
|
22
20
|
|
23
21
|
GIT_UNUSED(ctx);
|
24
22
|
|
@@ -29,11 +27,11 @@ static int basic_next_token(
|
|
29
27
|
|
30
28
|
cred = (git_credential_userpass_plaintext *)c;
|
31
29
|
|
32
|
-
|
30
|
+
git_str_printf(&raw, "%s:%s", cred->username, cred->password);
|
33
31
|
|
34
|
-
if (
|
35
|
-
|
36
|
-
|
32
|
+
if (git_str_oom(&raw) ||
|
33
|
+
git_str_puts(out, "Basic ") < 0 ||
|
34
|
+
git_str_encode_base64(out, git_str_cstr(&raw), raw.size) < 0)
|
37
35
|
goto on_error;
|
38
36
|
|
39
37
|
error = 0;
|
@@ -42,7 +40,7 @@ on_error:
|
|
42
40
|
if (raw.size)
|
43
41
|
git__memzero(raw.ptr, raw.size);
|
44
42
|
|
45
|
-
|
43
|
+
git_str_dispose(&raw);
|
46
44
|
return error;
|
47
45
|
}
|
48
46
|
|
@@ -10,13 +10,12 @@
|
|
10
10
|
|
11
11
|
#include "common.h"
|
12
12
|
|
13
|
-
#include "git2.h"
|
14
13
|
#include "netops.h"
|
15
14
|
|
16
15
|
typedef enum {
|
17
16
|
GIT_HTTP_AUTH_BASIC = 1,
|
18
17
|
GIT_HTTP_AUTH_NEGOTIATE = 2,
|
19
|
-
GIT_HTTP_AUTH_NTLM = 4
|
18
|
+
GIT_HTTP_AUTH_NTLM = 4
|
20
19
|
} git_http_auth_t;
|
21
20
|
|
22
21
|
typedef struct git_http_auth_context git_http_auth_context;
|
@@ -35,7 +34,7 @@ struct git_http_auth_context {
|
|
35
34
|
int (*set_challenge)(git_http_auth_context *ctx, const char *challenge);
|
36
35
|
|
37
36
|
/** Gets the next authentication token from the context */
|
38
|
-
int (*next_token)(
|
37
|
+
int (*next_token)(git_str *out, git_http_auth_context *ctx, git_credential *cred);
|
39
38
|
|
40
39
|
/** Examines if all tokens have been presented. */
|
41
40
|
int (*is_complete)(git_http_auth_context *ctx);
|
@@ -10,7 +10,6 @@
|
|
10
10
|
#if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK)
|
11
11
|
|
12
12
|
#include "git2.h"
|
13
|
-
#include "buffer.h"
|
14
13
|
#include "auth.h"
|
15
14
|
#include "git2/sys/credential.h"
|
16
15
|
|
@@ -33,7 +32,7 @@ typedef struct {
|
|
33
32
|
git_http_auth_context parent;
|
34
33
|
unsigned configured : 1,
|
35
34
|
complete : 1;
|
36
|
-
|
35
|
+
git_str target;
|
37
36
|
char *challenge;
|
38
37
|
gss_ctx_id_t gss_context;
|
39
38
|
gss_OID oid;
|
@@ -65,7 +64,9 @@ static int negotiate_set_challenge(
|
|
65
64
|
{
|
66
65
|
http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
|
67
66
|
|
68
|
-
|
67
|
+
GIT_ASSERT_ARG(ctx);
|
68
|
+
GIT_ASSERT_ARG(challenge);
|
69
|
+
GIT_ASSERT(ctx->configured);
|
69
70
|
|
70
71
|
git__free(ctx->challenge);
|
71
72
|
|
@@ -85,14 +86,14 @@ static void negotiate_context_dispose(http_auth_negotiate_context *ctx)
|
|
85
86
|
ctx->gss_context = GSS_C_NO_CONTEXT;
|
86
87
|
}
|
87
88
|
|
88
|
-
|
89
|
+
git_str_dispose(&ctx->target);
|
89
90
|
|
90
91
|
git__free(ctx->challenge);
|
91
92
|
ctx->challenge = NULL;
|
92
93
|
}
|
93
94
|
|
94
95
|
static int negotiate_next_token(
|
95
|
-
|
96
|
+
git_str *buf,
|
96
97
|
git_http_auth_context *c,
|
97
98
|
git_credential *cred)
|
98
99
|
{
|
@@ -102,13 +103,18 @@ static int negotiate_next_token(
|
|
102
103
|
input_token = GSS_C_EMPTY_BUFFER,
|
103
104
|
output_token = GSS_C_EMPTY_BUFFER;
|
104
105
|
gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER;
|
105
|
-
|
106
|
+
git_str input_buf = GIT_STR_INIT;
|
106
107
|
gss_name_t server = NULL;
|
107
108
|
gss_OID mech;
|
108
109
|
size_t challenge_len;
|
109
110
|
int error = 0;
|
110
111
|
|
111
|
-
|
112
|
+
GIT_ASSERT_ARG(buf);
|
113
|
+
GIT_ASSERT_ARG(ctx);
|
114
|
+
GIT_ASSERT_ARG(cred);
|
115
|
+
|
116
|
+
GIT_ASSERT(ctx->configured);
|
117
|
+
GIT_ASSERT(cred->credtype == GIT_CREDENTIAL_DEFAULT);
|
112
118
|
|
113
119
|
if (ctx->complete)
|
114
120
|
return 0;
|
@@ -135,7 +141,7 @@ static int negotiate_next_token(
|
|
135
141
|
}
|
136
142
|
|
137
143
|
if (challenge_len > 9) {
|
138
|
-
if (
|
144
|
+
if (git_str_decode_base64(&input_buf,
|
139
145
|
ctx->challenge + 10, challenge_len - 10) < 0) {
|
140
146
|
git_error_set(GIT_ERROR_NET, "invalid negotiate challenge from server");
|
141
147
|
error = -1;
|
@@ -185,16 +191,16 @@ static int negotiate_next_token(
|
|
185
191
|
goto done;
|
186
192
|
}
|
187
193
|
|
188
|
-
|
189
|
-
|
194
|
+
git_str_puts(buf, "Negotiate ");
|
195
|
+
git_str_encode_base64(buf, output_token.value, output_token.length);
|
190
196
|
|
191
|
-
if (
|
197
|
+
if (git_str_oom(buf))
|
192
198
|
error = -1;
|
193
199
|
|
194
200
|
done:
|
195
201
|
gss_release_name(&status_minor, &server);
|
196
202
|
gss_release_buffer(&status_minor, (gss_buffer_t) &output_token);
|
197
|
-
|
203
|
+
git_str_dispose(&input_buf);
|
198
204
|
return error;
|
199
205
|
}
|
200
206
|
|
@@ -202,7 +208,7 @@ static int negotiate_is_complete(git_http_auth_context *c)
|
|
202
208
|
{
|
203
209
|
http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
|
204
210
|
|
205
|
-
|
211
|
+
GIT_ASSERT_ARG(ctx);
|
206
212
|
|
207
213
|
return (ctx->complete == 1);
|
208
214
|
}
|
@@ -260,13 +266,13 @@ static int negotiate_init_context(
|
|
260
266
|
|
261
267
|
if (!ctx->oid) {
|
262
268
|
git_error_set(GIT_ERROR_NET, "negotiate authentication is not supported");
|
263
|
-
return
|
269
|
+
return GIT_EAUTH;
|
264
270
|
}
|
265
271
|
|
266
|
-
|
267
|
-
|
272
|
+
git_str_puts(&ctx->target, "HTTP@");
|
273
|
+
git_str_puts(&ctx->target, url->host);
|
268
274
|
|
269
|
-
if (
|
275
|
+
if (git_str_oom(&ctx->target))
|
270
276
|
return -1;
|
271
277
|
|
272
278
|
ctx->gss_context = GSS_C_NO_CONTEXT;
|
@@ -5,16 +5,16 @@
|
|
5
5
|
* a Linking Exception. For full terms see the included COPYING file.
|
6
6
|
*/
|
7
7
|
|
8
|
-
#include "
|
8
|
+
#include "auth_ntlm.h"
|
9
|
+
|
9
10
|
#include "common.h"
|
10
|
-
#include "
|
11
|
+
#include "str.h"
|
11
12
|
#include "auth.h"
|
12
|
-
#include "auth_ntlm.h"
|
13
13
|
#include "git2/sys/credential.h"
|
14
14
|
|
15
15
|
#ifdef GIT_NTLM
|
16
16
|
|
17
|
-
#include "
|
17
|
+
#include "ntlmclient.h"
|
18
18
|
|
19
19
|
typedef struct {
|
20
20
|
git_http_auth_context parent;
|
@@ -29,7 +29,8 @@ static int ntlm_set_challenge(
|
|
29
29
|
{
|
30
30
|
http_auth_ntlm_context *ctx = (http_auth_ntlm_context *)c;
|
31
31
|
|
32
|
-
|
32
|
+
GIT_ASSERT_ARG(ctx);
|
33
|
+
GIT_ASSERT_ARG(challenge);
|
33
34
|
|
34
35
|
git__free(ctx->challenge);
|
35
36
|
|
@@ -46,7 +47,7 @@ static int ntlm_set_credentials(http_auth_ntlm_context *ctx, git_credential *_cr
|
|
46
47
|
char *domain = NULL, *domainuser = NULL;
|
47
48
|
int error = 0;
|
48
49
|
|
49
|
-
|
50
|
+
GIT_ASSERT(_cred->credtype == GIT_CREDENTIAL_USERPASS_PLAINTEXT);
|
50
51
|
cred = (git_credential_userpass_plaintext *)_cred;
|
51
52
|
|
52
53
|
if ((sep = strchr(cred->username, '\\')) != NULL) {
|
@@ -76,17 +77,20 @@ done:
|
|
76
77
|
}
|
77
78
|
|
78
79
|
static int ntlm_next_token(
|
79
|
-
|
80
|
+
git_str *buf,
|
80
81
|
git_http_auth_context *c,
|
81
82
|
git_credential *cred)
|
82
83
|
{
|
83
84
|
http_auth_ntlm_context *ctx = (http_auth_ntlm_context *)c;
|
84
|
-
|
85
|
+
git_str input_buf = GIT_STR_INIT;
|
85
86
|
const unsigned char *msg;
|
86
87
|
size_t challenge_len, msg_len;
|
87
|
-
int error =
|
88
|
+
int error = GIT_EAUTH;
|
89
|
+
|
90
|
+
GIT_ASSERT_ARG(buf);
|
91
|
+
GIT_ASSERT_ARG(ctx);
|
88
92
|
|
89
|
-
|
93
|
+
GIT_ASSERT(ctx->ntlm);
|
90
94
|
|
91
95
|
challenge_len = ctx->challenge ? strlen(ctx->challenge) : 0;
|
92
96
|
|
@@ -125,7 +129,7 @@ static int ntlm_next_token(
|
|
125
129
|
goto done;
|
126
130
|
}
|
127
131
|
|
128
|
-
if (
|
132
|
+
if (git_str_decode_base64(&input_buf,
|
129
133
|
ctx->challenge + 5, challenge_len - 5) < 0) {
|
130
134
|
git_error_set(GIT_ERROR_NET, "invalid NTLM challenge from server");
|
131
135
|
goto done;
|
@@ -145,16 +149,16 @@ static int ntlm_next_token(
|
|
145
149
|
}
|
146
150
|
}
|
147
151
|
|
148
|
-
|
149
|
-
|
152
|
+
git_str_puts(buf, "NTLM ");
|
153
|
+
git_str_encode_base64(buf, (const char *)msg, msg_len);
|
150
154
|
|
151
|
-
if (
|
155
|
+
if (git_str_oom(buf))
|
152
156
|
goto done;
|
153
157
|
|
154
158
|
error = 0;
|
155
159
|
|
156
160
|
done:
|
157
|
-
|
161
|
+
git_str_dispose(&input_buf);
|
158
162
|
return error;
|
159
163
|
}
|
160
164
|
|
@@ -162,7 +166,7 @@ static int ntlm_is_complete(git_http_auth_context *c)
|
|
162
166
|
{
|
163
167
|
http_auth_ntlm_context *ctx = (http_auth_ntlm_context *)c;
|
164
168
|
|
165
|
-
|
169
|
+
GIT_ASSERT_ARG(ctx);
|
166
170
|
return (ctx->complete == true);
|
167
171
|
}
|
168
172
|
|
@@ -85,7 +85,9 @@ int git_credential_userpass_plaintext_new(
|
|
85
85
|
{
|
86
86
|
git_credential_userpass_plaintext *c;
|
87
87
|
|
88
|
-
|
88
|
+
GIT_ASSERT_ARG(cred);
|
89
|
+
GIT_ASSERT_ARG(username);
|
90
|
+
GIT_ASSERT_ARG(password);
|
89
91
|
|
90
92
|
c = git__malloc(sizeof(git_credential_userpass_plaintext));
|
91
93
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -233,7 +235,9 @@ static int git_credential_ssh_key_type_new(
|
|
233
235
|
{
|
234
236
|
git_credential_ssh_key *c;
|
235
237
|
|
236
|
-
|
238
|
+
GIT_ASSERT_ARG(username);
|
239
|
+
GIT_ASSERT_ARG(cred);
|
240
|
+
GIT_ASSERT_ARG(privatekey);
|
237
241
|
|
238
242
|
c = git__calloc(1, sizeof(git_credential_ssh_key));
|
239
243
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -269,7 +273,9 @@ int git_credential_ssh_interactive_new(
|
|
269
273
|
{
|
270
274
|
git_credential_ssh_interactive *c;
|
271
275
|
|
272
|
-
|
276
|
+
GIT_ASSERT_ARG(out);
|
277
|
+
GIT_ASSERT_ARG(username);
|
278
|
+
GIT_ASSERT_ARG(prompt_callback);
|
273
279
|
|
274
280
|
c = git__calloc(1, sizeof(git_credential_ssh_interactive));
|
275
281
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -290,7 +296,8 @@ int git_credential_ssh_interactive_new(
|
|
290
296
|
int git_credential_ssh_key_from_agent(git_credential **cred, const char *username) {
|
291
297
|
git_credential_ssh_key *c;
|
292
298
|
|
293
|
-
|
299
|
+
GIT_ASSERT_ARG(username);
|
300
|
+
GIT_ASSERT_ARG(cred);
|
294
301
|
|
295
302
|
c = git__calloc(1, sizeof(git_credential_ssh_key));
|
296
303
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -317,7 +324,8 @@ int git_credential_ssh_custom_new(
|
|
317
324
|
{
|
318
325
|
git_credential_ssh_custom *c;
|
319
326
|
|
320
|
-
|
327
|
+
GIT_ASSERT_ARG(username);
|
328
|
+
GIT_ASSERT_ARG(cred);
|
321
329
|
|
322
330
|
c = git__calloc(1, sizeof(git_credential_ssh_custom));
|
323
331
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -347,7 +355,7 @@ int git_credential_default_new(git_credential **cred)
|
|
347
355
|
{
|
348
356
|
git_credential_default *c;
|
349
357
|
|
350
|
-
|
358
|
+
GIT_ASSERT_ARG(cred);
|
351
359
|
|
352
360
|
c = git__calloc(1, sizeof(git_credential_default));
|
353
361
|
GIT_ERROR_CHECK_ALLOC(c);
|
@@ -364,7 +372,7 @@ int git_credential_username_new(git_credential **cred, const char *username)
|
|
364
372
|
git_credential_username *c;
|
365
373
|
size_t len, allocsize;
|
366
374
|
|
367
|
-
|
375
|
+
GIT_ASSERT_ARG(cred);
|
368
376
|
|
369
377
|
len = strlen(username);
|
370
378
|
|
@@ -7,12 +7,10 @@
|
|
7
7
|
|
8
8
|
#include "common.h"
|
9
9
|
|
10
|
-
#include "git2.h"
|
11
|
-
#include "buffer.h"
|
12
10
|
#include "netops.h"
|
13
|
-
#include "git2/sys/transport.h"
|
14
11
|
#include "stream.h"
|
15
12
|
#include "streams/socket.h"
|
13
|
+
#include "git2/sys/transport.h"
|
16
14
|
|
17
15
|
#define OWNING_SUBTRANSPORT(s) ((git_subtransport *)(s)->parent.subtransport)
|
18
16
|
|
@@ -39,7 +37,7 @@ typedef struct {
|
|
39
37
|
*
|
40
38
|
* For example: 0035git-upload-pack /libgit2/libgit2\0host=github.com\0
|
41
39
|
*/
|
42
|
-
static int gen_proto(
|
40
|
+
static int gen_proto(git_str *request, const char *cmd, const char *url)
|
43
41
|
{
|
44
42
|
char *delim, *repo;
|
45
43
|
char host[] = "host=";
|
@@ -61,13 +59,13 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
|
|
61
59
|
|
62
60
|
len = 4 + strlen(cmd) + 1 + strlen(repo) + 1 + strlen(host) + (delim - url) + 1;
|
63
61
|
|
64
|
-
|
65
|
-
|
62
|
+
git_str_grow(request, len);
|
63
|
+
git_str_printf(request, "%04x%s %s%c%s",
|
66
64
|
(unsigned int)(len & 0x0FFFF), cmd, repo, 0, host);
|
67
|
-
|
68
|
-
|
65
|
+
git_str_put(request, url, delim - url);
|
66
|
+
git_str_putc(request, '\0');
|
69
67
|
|
70
|
-
if (
|
68
|
+
if (git_str_oom(request))
|
71
69
|
return -1;
|
72
70
|
|
73
71
|
return 0;
|
@@ -75,7 +73,7 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
|
|
75
73
|
|
76
74
|
static int send_command(git_proto_stream *s)
|
77
75
|
{
|
78
|
-
|
76
|
+
git_str request = GIT_STR_INIT;
|
79
77
|
int error;
|
80
78
|
|
81
79
|
if ((error = gen_proto(&request, s->cmd, s->url)) < 0)
|
@@ -87,7 +85,7 @@ static int send_command(git_proto_stream *s)
|
|
87
85
|
s->sent_command = 1;
|
88
86
|
|
89
87
|
cleanup:
|
90
|
-
|
88
|
+
git_str_dispose(&request);
|
91
89
|
return error;
|
92
90
|
}
|
93
91
|
|
@@ -327,7 +325,7 @@ static int _git_close(git_smart_subtransport *subtransport)
|
|
327
325
|
{
|
328
326
|
git_subtransport *t = (git_subtransport *) subtransport;
|
329
327
|
|
330
|
-
|
328
|
+
GIT_ASSERT(!t->current_stream);
|
331
329
|
|
332
330
|
GIT_UNUSED(t);
|
333
331
|
|
@@ -338,8 +336,6 @@ static void _git_free(git_smart_subtransport *subtransport)
|
|
338
336
|
{
|
339
337
|
git_subtransport *t = (git_subtransport *) subtransport;
|
340
338
|
|
341
|
-
assert(!t->current_stream);
|
342
|
-
|
343
339
|
git__free(t);
|
344
340
|
}
|
345
341
|
|