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/tag.c
CHANGED
@@ -9,7 +9,6 @@
|
|
9
9
|
|
10
10
|
#include "commit.h"
|
11
11
|
#include "signature.h"
|
12
|
-
#include "message.h"
|
13
12
|
#include "wildmatch.h"
|
14
13
|
#include "git2/object.h"
|
15
14
|
#include "git2/repository.h"
|
@@ -27,25 +26,25 @@ void git_tag__free(void *_tag)
|
|
27
26
|
|
28
27
|
int git_tag_target(git_object **target, const git_tag *t)
|
29
28
|
{
|
30
|
-
|
29
|
+
GIT_ASSERT_ARG(t);
|
31
30
|
return git_object_lookup(target, t->object.repo, &t->target, t->type);
|
32
31
|
}
|
33
32
|
|
34
33
|
const git_oid *git_tag_target_id(const git_tag *t)
|
35
34
|
{
|
36
|
-
|
35
|
+
GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
|
37
36
|
return &t->target;
|
38
37
|
}
|
39
38
|
|
40
39
|
git_object_t git_tag_target_type(const git_tag *t)
|
41
40
|
{
|
42
|
-
|
41
|
+
GIT_ASSERT_ARG_WITH_RETVAL(t, GIT_OBJECT_INVALID);
|
43
42
|
return t->type;
|
44
43
|
}
|
45
44
|
|
46
45
|
const char *git_tag_name(const git_tag *t)
|
47
46
|
{
|
48
|
-
|
47
|
+
GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
|
49
48
|
return t->tag_name;
|
50
49
|
}
|
51
50
|
|
@@ -56,14 +55,14 @@ const git_signature *git_tag_tagger(const git_tag *t)
|
|
56
55
|
|
57
56
|
const char *git_tag_message(const git_tag *t)
|
58
57
|
{
|
59
|
-
|
58
|
+
GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
|
60
59
|
return t->message;
|
61
60
|
}
|
62
61
|
|
63
62
|
static int tag_error(const char *str)
|
64
63
|
{
|
65
64
|
git_error_set(GIT_ERROR_TAG, "failed to parse tag: %s", str);
|
66
|
-
return
|
65
|
+
return GIT_EINVALID;
|
67
66
|
}
|
68
67
|
|
69
68
|
static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
|
@@ -74,6 +73,7 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
|
|
74
73
|
size_t text_len, alloc_len;
|
75
74
|
const char *search;
|
76
75
|
unsigned int i;
|
76
|
+
int error;
|
77
77
|
|
78
78
|
if (git_oid__parse(&tag->target, &buffer, buffer_end, "object ") < 0)
|
79
79
|
return tag_error("object field invalid");
|
@@ -131,8 +131,8 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
|
|
131
131
|
tag->tagger = git__malloc(sizeof(git_signature));
|
132
132
|
GIT_ERROR_CHECK_ALLOC(tag->tagger);
|
133
133
|
|
134
|
-
if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0)
|
135
|
-
return
|
134
|
+
if ((error = git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n')) < 0)
|
135
|
+
return error;
|
136
136
|
}
|
137
137
|
|
138
138
|
tag->message = NULL;
|
@@ -176,7 +176,7 @@ int git_tag__parse(void *_tag, git_odb_object *odb_obj)
|
|
176
176
|
|
177
177
|
static int retrieve_tag_reference(
|
178
178
|
git_reference **tag_reference_out,
|
179
|
-
|
179
|
+
git_str *ref_name_out,
|
180
180
|
git_repository *repo,
|
181
181
|
const char *tag_name)
|
182
182
|
{
|
@@ -185,7 +185,7 @@ static int retrieve_tag_reference(
|
|
185
185
|
|
186
186
|
*tag_reference_out = NULL;
|
187
187
|
|
188
|
-
if (
|
188
|
+
if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
|
189
189
|
return -1;
|
190
190
|
|
191
191
|
error = git_reference_lookup(&tag_ref, repo, ref_name_out->ptr);
|
@@ -199,11 +199,11 @@ static int retrieve_tag_reference(
|
|
199
199
|
|
200
200
|
static int retrieve_tag_reference_oid(
|
201
201
|
git_oid *oid,
|
202
|
-
|
202
|
+
git_str *ref_name_out,
|
203
203
|
git_repository *repo,
|
204
204
|
const char *tag_name)
|
205
205
|
{
|
206
|
-
if (
|
206
|
+
if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
|
207
207
|
return -1;
|
208
208
|
|
209
209
|
return git_reference_name_to_id(oid, repo, ref_name_out->ptr);
|
@@ -217,16 +217,16 @@ static int write_tag_annotation(
|
|
217
217
|
const git_signature *tagger,
|
218
218
|
const char *message)
|
219
219
|
{
|
220
|
-
|
220
|
+
git_str tag = GIT_STR_INIT;
|
221
221
|
git_odb *odb;
|
222
222
|
|
223
223
|
git_oid__writebuf(&tag, "object ", git_object_id(target));
|
224
|
-
|
225
|
-
|
224
|
+
git_str_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target)));
|
225
|
+
git_str_printf(&tag, "tag %s\n", tag_name);
|
226
226
|
git_signature__writebuf(&tag, "tagger ", tagger);
|
227
|
-
|
227
|
+
git_str_putc(&tag, '\n');
|
228
228
|
|
229
|
-
if (
|
229
|
+
if (git_str_puts(&tag, message) < 0)
|
230
230
|
goto on_error;
|
231
231
|
|
232
232
|
if (git_repository_odb__weakptr(&odb, repo) < 0)
|
@@ -235,11 +235,11 @@ static int write_tag_annotation(
|
|
235
235
|
if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJECT_TAG) < 0)
|
236
236
|
goto on_error;
|
237
237
|
|
238
|
-
|
238
|
+
git_str_dispose(&tag);
|
239
239
|
return 0;
|
240
240
|
|
241
241
|
on_error:
|
242
|
-
|
242
|
+
git_str_dispose(&tag);
|
243
243
|
git_error_set(GIT_ERROR_OBJECT, "failed to create tag annotation");
|
244
244
|
return -1;
|
245
245
|
}
|
@@ -255,12 +255,14 @@ static int git_tag_create__internal(
|
|
255
255
|
int create_tag_annotation)
|
256
256
|
{
|
257
257
|
git_reference *new_ref = NULL;
|
258
|
-
|
258
|
+
git_str ref_name = GIT_STR_INIT;
|
259
259
|
|
260
260
|
int error;
|
261
261
|
|
262
|
-
|
263
|
-
|
262
|
+
GIT_ASSERT_ARG(repo);
|
263
|
+
GIT_ASSERT_ARG(tag_name);
|
264
|
+
GIT_ASSERT_ARG(target);
|
265
|
+
GIT_ASSERT_ARG(!create_tag_annotation || (tagger && message));
|
264
266
|
|
265
267
|
if (git_object_owner(target) != repo) {
|
266
268
|
git_error_set(GIT_ERROR_INVALID, "the given target does not belong to this repository");
|
@@ -274,7 +276,7 @@ static int git_tag_create__internal(
|
|
274
276
|
/** Ensure the tag name doesn't conflict with an already existing
|
275
277
|
* reference unless overwriting has explicitly been requested **/
|
276
278
|
if (error == 0 && !allow_ref_overwrite) {
|
277
|
-
|
279
|
+
git_str_dispose(&ref_name);
|
278
280
|
git_error_set(GIT_ERROR_TAG, "tag already exists");
|
279
281
|
return GIT_EEXISTS;
|
280
282
|
}
|
@@ -289,7 +291,7 @@ static int git_tag_create__internal(
|
|
289
291
|
|
290
292
|
cleanup:
|
291
293
|
git_reference_free(new_ref);
|
292
|
-
|
294
|
+
git_str_dispose(&ref_name);
|
293
295
|
return error;
|
294
296
|
}
|
295
297
|
|
@@ -313,7 +315,12 @@ int git_tag_annotation_create(
|
|
313
315
|
const git_signature *tagger,
|
314
316
|
const char *message)
|
315
317
|
{
|
316
|
-
|
318
|
+
GIT_ASSERT_ARG(oid);
|
319
|
+
GIT_ASSERT_ARG(repo);
|
320
|
+
GIT_ASSERT_ARG(tag_name);
|
321
|
+
GIT_ASSERT_ARG(target);
|
322
|
+
GIT_ASSERT_ARG(tagger);
|
323
|
+
GIT_ASSERT_ARG(message);
|
317
324
|
|
318
325
|
return write_tag_annotation(oid, repo, tag_name, target, tagger, message);
|
319
326
|
}
|
@@ -337,9 +344,10 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
|
|
337
344
|
git_odb_object *target_obj;
|
338
345
|
|
339
346
|
git_reference *new_ref = NULL;
|
340
|
-
|
347
|
+
git_str ref_name = GIT_STR_INIT;
|
341
348
|
|
342
|
-
|
349
|
+
GIT_ASSERT_ARG(oid);
|
350
|
+
GIT_ASSERT_ARG(buffer);
|
343
351
|
|
344
352
|
memset(&tag, 0, sizeof(tag));
|
345
353
|
|
@@ -387,7 +395,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
|
|
387
395
|
git_odb_stream_free(stream);
|
388
396
|
|
389
397
|
if (error < 0) {
|
390
|
-
|
398
|
+
git_str_dispose(&ref_name);
|
391
399
|
return error;
|
392
400
|
}
|
393
401
|
|
@@ -395,7 +403,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
|
|
395
403
|
&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
|
396
404
|
|
397
405
|
git_reference_free(new_ref);
|
398
|
-
|
406
|
+
git_str_dispose(&ref_name);
|
399
407
|
|
400
408
|
return error;
|
401
409
|
|
@@ -410,12 +418,12 @@ on_error:
|
|
410
418
|
int git_tag_delete(git_repository *repo, const char *tag_name)
|
411
419
|
{
|
412
420
|
git_reference *tag_ref;
|
413
|
-
|
421
|
+
git_str ref_name = GIT_STR_INIT;
|
414
422
|
int error;
|
415
423
|
|
416
424
|
error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
|
417
425
|
|
418
|
-
|
426
|
+
git_str_dispose(&ref_name);
|
419
427
|
|
420
428
|
if (error < 0)
|
421
429
|
return error;
|
@@ -454,7 +462,8 @@ int git_tag_foreach(git_repository *repo, git_tag_foreach_cb cb, void *cb_data)
|
|
454
462
|
{
|
455
463
|
tag_cb_data data;
|
456
464
|
|
457
|
-
|
465
|
+
GIT_ASSERT_ARG(repo);
|
466
|
+
GIT_ASSERT_ARG(cb);
|
458
467
|
|
459
468
|
data.cb = cb;
|
460
469
|
data.cb_data = cb_data;
|
@@ -493,7 +502,9 @@ int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_reposit
|
|
493
502
|
tag_filter_data filter;
|
494
503
|
git_vector taglist;
|
495
504
|
|
496
|
-
|
505
|
+
GIT_ASSERT_ARG(tag_names);
|
506
|
+
GIT_ASSERT_ARG(repo);
|
507
|
+
GIT_ASSERT_ARG(pattern);
|
497
508
|
|
498
509
|
if ((error = git_vector_init(&taglist, 8, NULL)) < 0)
|
499
510
|
return error;
|
@@ -522,6 +533,33 @@ int git_tag_peel(git_object **tag_target, const git_tag *tag)
|
|
522
533
|
return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJECT_ANY);
|
523
534
|
}
|
524
535
|
|
536
|
+
int git_tag_name_is_valid(int *valid, const char *name)
|
537
|
+
{
|
538
|
+
git_str ref_name = GIT_STR_INIT;
|
539
|
+
int error = 0;
|
540
|
+
|
541
|
+
GIT_ASSERT(valid);
|
542
|
+
|
543
|
+
*valid = 0;
|
544
|
+
|
545
|
+
/*
|
546
|
+
* Discourage tag name starting with dash,
|
547
|
+
* https://github.com/git/git/commit/4f0accd638b8d2
|
548
|
+
*/
|
549
|
+
if (!name || name[0] == '-')
|
550
|
+
goto done;
|
551
|
+
|
552
|
+
if ((error = git_str_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||
|
553
|
+
(error = git_str_puts(&ref_name, name)) < 0)
|
554
|
+
goto done;
|
555
|
+
|
556
|
+
error = git_reference_name_is_valid(valid, ref_name.ptr);
|
557
|
+
|
558
|
+
done:
|
559
|
+
git_str_dispose(&ref_name);
|
560
|
+
return error;
|
561
|
+
}
|
562
|
+
|
525
563
|
/* Deprecated Functions */
|
526
564
|
|
527
565
|
#ifndef GIT_DEPRECATE_HARD
|
@@ -0,0 +1,140 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include "common.h"
|
9
|
+
|
10
|
+
#if !defined(GIT_THREADS)
|
11
|
+
|
12
|
+
#define TLSDATA_MAX 16
|
13
|
+
|
14
|
+
typedef struct {
|
15
|
+
void *value;
|
16
|
+
void (GIT_SYSTEM_CALL *destroy_fn)(void *);
|
17
|
+
} tlsdata_value;
|
18
|
+
|
19
|
+
static tlsdata_value tlsdata_values[TLSDATA_MAX];
|
20
|
+
static int tlsdata_cnt = 0;
|
21
|
+
|
22
|
+
int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
|
23
|
+
{
|
24
|
+
if (tlsdata_cnt >= TLSDATA_MAX)
|
25
|
+
return -1;
|
26
|
+
|
27
|
+
tlsdata_values[tlsdata_cnt].value = NULL;
|
28
|
+
tlsdata_values[tlsdata_cnt].destroy_fn = destroy_fn;
|
29
|
+
|
30
|
+
*key = tlsdata_cnt;
|
31
|
+
tlsdata_cnt++;
|
32
|
+
|
33
|
+
return 0;
|
34
|
+
}
|
35
|
+
|
36
|
+
int git_tlsdata_set(git_tlsdata_key key, void *value)
|
37
|
+
{
|
38
|
+
if (key < 0 || key > tlsdata_cnt)
|
39
|
+
return -1;
|
40
|
+
|
41
|
+
tlsdata_values[key].value = value;
|
42
|
+
return 0;
|
43
|
+
}
|
44
|
+
|
45
|
+
void *git_tlsdata_get(git_tlsdata_key key)
|
46
|
+
{
|
47
|
+
if (key < 0 || key > tlsdata_cnt)
|
48
|
+
return NULL;
|
49
|
+
|
50
|
+
return tlsdata_values[key].value;
|
51
|
+
}
|
52
|
+
|
53
|
+
int git_tlsdata_dispose(git_tlsdata_key key)
|
54
|
+
{
|
55
|
+
void *value;
|
56
|
+
void (*destroy_fn)(void *) = NULL;
|
57
|
+
|
58
|
+
if (key < 0 || key > tlsdata_cnt)
|
59
|
+
return -1;
|
60
|
+
|
61
|
+
value = tlsdata_values[key].value;
|
62
|
+
destroy_fn = tlsdata_values[key].destroy_fn;
|
63
|
+
|
64
|
+
tlsdata_values[key].value = NULL;
|
65
|
+
tlsdata_values[key].destroy_fn = NULL;
|
66
|
+
|
67
|
+
if (value && destroy_fn)
|
68
|
+
destroy_fn(value);
|
69
|
+
|
70
|
+
return 0;
|
71
|
+
}
|
72
|
+
|
73
|
+
#elif defined(GIT_WIN32)
|
74
|
+
|
75
|
+
int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
|
76
|
+
{
|
77
|
+
DWORD fls_index = FlsAlloc(destroy_fn);
|
78
|
+
|
79
|
+
if (fls_index == FLS_OUT_OF_INDEXES)
|
80
|
+
return -1;
|
81
|
+
|
82
|
+
*key = fls_index;
|
83
|
+
return 0;
|
84
|
+
}
|
85
|
+
|
86
|
+
int git_tlsdata_set(git_tlsdata_key key, void *value)
|
87
|
+
{
|
88
|
+
if (!FlsSetValue(key, value))
|
89
|
+
return -1;
|
90
|
+
|
91
|
+
return 0;
|
92
|
+
}
|
93
|
+
|
94
|
+
void *git_tlsdata_get(git_tlsdata_key key)
|
95
|
+
{
|
96
|
+
return FlsGetValue(key);
|
97
|
+
}
|
98
|
+
|
99
|
+
int git_tlsdata_dispose(git_tlsdata_key key)
|
100
|
+
{
|
101
|
+
if (!FlsFree(key))
|
102
|
+
return -1;
|
103
|
+
|
104
|
+
return 0;
|
105
|
+
}
|
106
|
+
|
107
|
+
#elif defined(_POSIX_THREADS)
|
108
|
+
|
109
|
+
int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
|
110
|
+
{
|
111
|
+
if (pthread_key_create(key, destroy_fn) != 0)
|
112
|
+
return -1;
|
113
|
+
|
114
|
+
return 0;
|
115
|
+
}
|
116
|
+
|
117
|
+
int git_tlsdata_set(git_tlsdata_key key, void *value)
|
118
|
+
{
|
119
|
+
if (pthread_setspecific(key, value) != 0)
|
120
|
+
return -1;
|
121
|
+
|
122
|
+
return 0;
|
123
|
+
}
|
124
|
+
|
125
|
+
void *git_tlsdata_get(git_tlsdata_key key)
|
126
|
+
{
|
127
|
+
return pthread_getspecific(key);
|
128
|
+
}
|
129
|
+
|
130
|
+
int git_tlsdata_dispose(git_tlsdata_key key)
|
131
|
+
{
|
132
|
+
if (pthread_key_delete(key) != 0)
|
133
|
+
return -1;
|
134
|
+
|
135
|
+
return 0;
|
136
|
+
}
|
137
|
+
|
138
|
+
#else
|
139
|
+
# error unknown threading model
|
140
|
+
#endif
|