rugged 0.28.5 → 0.99.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/rugged/extconf.rb +3 -1
- data/ext/rugged/rugged.c +35 -31
- data/ext/rugged/rugged.h +13 -0
- data/ext/rugged/rugged_blob.c +11 -9
- data/ext/rugged/rugged_commit.c +17 -15
- data/ext/rugged/rugged_diff.c +4 -26
- data/ext/rugged/rugged_index.c +4 -2
- data/ext/rugged/rugged_note.c +5 -3
- data/ext/rugged/rugged_object.c +57 -10
- data/ext/rugged/rugged_rebase.c +3 -1
- data/ext/rugged/rugged_remote.c +0 -6
- data/ext/rugged/rugged_repo.c +222 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +38 -19
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +5 -1
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +33 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1422 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +21 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9800 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +421 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/apply.h +22 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +2 -2
- data/vendor/libgit2/include/git2/blob.h +44 -12
- data/vendor/libgit2/include/git2/branch.h +74 -57
- data/vendor/libgit2/include/git2/buffer.h +20 -14
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +46 -14
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +2 -2
- data/vendor/libgit2/include/git2/commit.h +23 -1
- data/vendor/libgit2/include/git2/common.h +15 -6
- data/vendor/libgit2/include/git2/config.h +12 -12
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
- data/vendor/libgit2/include/git2/credential.h +314 -0
- data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
- data/vendor/libgit2/include/git2/deprecated.h +314 -3
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +16 -14
- data/vendor/libgit2/include/git2/errors.h +4 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +2 -1
- data/vendor/libgit2/include/git2/indexer.h +48 -4
- data/vendor/libgit2/include/git2/merge.h +6 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/object.h +2 -14
- data/vendor/libgit2/include/git2/odb.h +3 -2
- data/vendor/libgit2/include/git2/odb_backend.h +5 -4
- data/vendor/libgit2/include/git2/oid.h +11 -6
- data/vendor/libgit2/include/git2/pack.h +12 -1
- data/vendor/libgit2/include/git2/proxy.h +6 -4
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +19 -0
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +24 -2
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +25 -16
- data/vendor/libgit2/include/git2/submodule.h +20 -3
- data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
- data/vendor/libgit2/include/git2/sys/cred.h +15 -0
- data/vendor/libgit2/include/git2/sys/credential.h +90 -0
- data/vendor/libgit2/include/git2/sys/index.h +4 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
- data/vendor/libgit2/include/git2/sys/merge.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +57 -21
- data/vendor/libgit2/include/git2/sys/repository.h +17 -6
- data/vendor/libgit2/include/git2/sys/transport.h +4 -4
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -340
- data/vendor/libgit2/include/git2/tree.h +5 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +89 -224
- data/vendor/libgit2/src/alloc.c +2 -14
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/apply.c +31 -15
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +189 -96
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +47 -47
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +17 -5
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +21 -7
- data/vendor/libgit2/src/blob.c +81 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +60 -32
- data/vendor/libgit2/src/buffer.c +5 -0
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +26 -33
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +26 -16
- data/vendor/libgit2/src/cherrypick.c +7 -1
- data/vendor/libgit2/src/clone.c +29 -7
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +70 -22
- data/vendor/libgit2/src/commit.h +6 -0
- data/vendor/libgit2/src/commit_list.c +28 -76
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +3 -75
- data/vendor/libgit2/src/config.c +31 -40
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +39 -39
- data/vendor/libgit2/src/config_entries.c +69 -99
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +337 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +49 -29
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +206 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +21 -20
- data/vendor/libgit2/src/diff.c +43 -66
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +12 -10
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +26 -26
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +1 -1
- data/vendor/libgit2/src/diff_print.c +25 -13
- data/vendor/libgit2/src/diff_stats.c +1 -1
- data/vendor/libgit2/src/diff_tform.c +11 -11
- data/vendor/libgit2/src/errors.c +21 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +7 -2
- data/vendor/libgit2/src/fetchhead.c +9 -9
- data/vendor/libgit2/src/filebuf.c +1 -1
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +16 -8
- data/vendor/libgit2/src/{fileops.c → futils.c} +20 -17
- data/vendor/libgit2/src/{fileops.h → futils.h} +5 -5
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +19 -21
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
- data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
- data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
- data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/idxmap.c +91 -65
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +103 -81
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +69 -70
- data/vendor/libgit2/src/integer.h +11 -4
- data/vendor/libgit2/src/iterator.c +32 -28
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +55 -41
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +1 -1
- data/vendor/libgit2/src/mwindow.c +18 -23
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +411 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -222
- data/vendor/libgit2/src/netops.h +1 -37
- data/vendor/libgit2/src/notes.c +2 -2
- data/vendor/libgit2/src/object.c +3 -3
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +41 -23
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +17 -10
- data/vendor/libgit2/src/odb_mempack.c +13 -24
- data/vendor/libgit2/src/odb_pack.c +4 -4
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +19 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +25 -32
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +97 -129
- data/vendor/libgit2/src/pack.h +15 -18
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +1 -1
- data/vendor/libgit2/src/patch_generate.c +1 -1
- data/vendor/libgit2/src/patch_parse.c +30 -9
- data/vendor/libgit2/src/path.c +43 -6
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +14 -14
- data/vendor/libgit2/src/pool.c +26 -22
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +7 -7
- data/vendor/libgit2/src/posix.h +12 -1
- data/vendor/libgit2/src/proxy.c +7 -2
- data/vendor/libgit2/src/push.c +10 -5
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +87 -28
- data/vendor/libgit2/src/refdb.c +12 -0
- data/vendor/libgit2/src/refdb_fs.c +215 -169
- data/vendor/libgit2/src/reflog.c +11 -13
- data/vendor/libgit2/src/refs.c +34 -23
- data/vendor/libgit2/src/refs.h +8 -1
- data/vendor/libgit2/src/refspec.c +9 -16
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +57 -55
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +120 -103
- data/vendor/libgit2/src/repository.h +49 -40
- data/vendor/libgit2/src/revert.c +6 -1
- data/vendor/libgit2/src/revparse.c +18 -19
- data/vendor/libgit2/src/revwalk.c +71 -33
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +13 -1
- data/vendor/libgit2/src/sortedcache.c +12 -26
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +45 -65
- data/vendor/libgit2/src/status.c +17 -11
- data/vendor/libgit2/src/streams/openssl.c +53 -1
- data/vendor/libgit2/src/streams/socket.c +2 -2
- data/vendor/libgit2/src/strmap.c +37 -84
- data/vendor/libgit2/src/strmap.h +105 -33
- data/vendor/libgit2/src/submodule.c +151 -126
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/tag.c +10 -2
- data/vendor/libgit2/src/trace.c +1 -1
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +3 -8
- data/vendor/libgit2/src/transports/auth.c +16 -15
- data/vendor/libgit2/src/transports/auth.h +18 -11
- data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
- data/vendor/libgit2/src/transports/credential.c +476 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +21 -8
- data/vendor/libgit2/src/transports/git.c +11 -16
- data/vendor/libgit2/src/transports/http.c +488 -1248
- data/vendor/libgit2/src/transports/http.h +4 -1
- data/vendor/libgit2/src/transports/httpclient.c +1526 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +10 -10
- data/vendor/libgit2/src/transports/smart.c +19 -19
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
- data/vendor/libgit2/src/transports/ssh.c +77 -59
- data/vendor/libgit2/src/transports/winhttp.c +266 -241
- data/vendor/libgit2/src/tree-cache.c +14 -7
- data/vendor/libgit2/src/tree.c +16 -26
- data/vendor/libgit2/src/unix/map.c +1 -1
- data/vendor/libgit2/src/unix/posix.h +2 -12
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +51 -53
- data/vendor/libgit2/src/util.h +16 -21
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +12 -2
- data/vendor/libgit2/src/win32/path_w32.h +0 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +48 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +4 -9
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +31 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -32
- data/vendor/libgit2/src/worktree.c +36 -22
- data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +5 -0
- data/vendor/libgit2/src/zstream.h +1 -0
- metadata +108 -38
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/COPYING +0 -502
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/transports/cred.c +0 -390
data/vendor/libgit2/src/pack.c
CHANGED
@@ -7,22 +7,23 @@
|
|
7
7
|
|
8
8
|
#include "pack.h"
|
9
9
|
|
10
|
-
#include "odb.h"
|
11
10
|
#include "delta.h"
|
12
|
-
#include "
|
11
|
+
#include "futils.h"
|
13
12
|
#include "mwindow.h"
|
14
|
-
#include "
|
13
|
+
#include "odb.h"
|
15
14
|
#include "oid.h"
|
15
|
+
#include "sha1_lookup.h"
|
16
16
|
|
17
|
-
|
17
|
+
/* Option to bypass checking existence of '.keep' files */
|
18
|
+
bool git_disable_pack_keep_file_checks = false;
|
18
19
|
|
19
20
|
static int packfile_open(struct git_pack_file *p);
|
20
|
-
static
|
21
|
+
static off64_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n);
|
21
22
|
static int packfile_unpack_compressed(
|
22
23
|
git_rawobj *obj,
|
23
24
|
struct git_pack_file *p,
|
24
25
|
git_mwindow **w_curs,
|
25
|
-
|
26
|
+
off64_t *curpos,
|
26
27
|
size_t size,
|
27
28
|
git_object_t type);
|
28
29
|
|
@@ -34,7 +35,7 @@ static int packfile_unpack_compressed(
|
|
34
35
|
* GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ.
|
35
36
|
*/
|
36
37
|
static int pack_entry_find_offset(
|
37
|
-
|
38
|
+
off64_t *offset_out,
|
38
39
|
git_oid *found_oid,
|
39
40
|
struct git_pack_file *p,
|
40
41
|
const git_oid *short_oid,
|
@@ -89,8 +90,8 @@ static void cache_free(git_pack_cache *cache)
|
|
89
90
|
|
90
91
|
static int cache_init(git_pack_cache *cache)
|
91
92
|
{
|
92
|
-
cache->entries
|
93
|
-
|
93
|
+
if (git_offmap_new(&cache->entries) < 0)
|
94
|
+
return -1;
|
94
95
|
|
95
96
|
cache->memory_limit = GIT_PACK_CACHE_MEMORY_LIMIT;
|
96
97
|
|
@@ -106,17 +107,14 @@ static int cache_init(git_pack_cache *cache)
|
|
106
107
|
return 0;
|
107
108
|
}
|
108
109
|
|
109
|
-
static git_pack_cache_entry *cache_get(git_pack_cache *cache,
|
110
|
+
static git_pack_cache_entry *cache_get(git_pack_cache *cache, off64_t offset)
|
110
111
|
{
|
111
|
-
git_pack_cache_entry *entry
|
112
|
-
size_t k;
|
112
|
+
git_pack_cache_entry *entry;
|
113
113
|
|
114
114
|
if (git_mutex_lock(&cache->lock) < 0)
|
115
115
|
return NULL;
|
116
116
|
|
117
|
-
|
118
|
-
if (git_offmap_valid_index(cache->entries, k)) { /* found it */
|
119
|
-
entry = git_offmap_value_at(cache->entries, k);
|
117
|
+
if ((entry = git_offmap_get(cache->entries, offset)) != NULL) {
|
120
118
|
git_atomic_inc(&entry->refcount);
|
121
119
|
entry->last_usage = cache->use_ctr++;
|
122
120
|
}
|
@@ -128,7 +126,7 @@ static git_pack_cache_entry *cache_get(git_pack_cache *cache, git_off_t offset)
|
|
128
126
|
/* Run with the cache lock held */
|
129
127
|
static void free_lowest_entry(git_pack_cache *cache)
|
130
128
|
{
|
131
|
-
|
129
|
+
off64_t offset;
|
132
130
|
git_pack_cache_entry *entry;
|
133
131
|
|
134
132
|
git_offmap_foreach(cache->entries, offset, entry, {
|
@@ -144,11 +142,10 @@ static int cache_add(
|
|
144
142
|
git_pack_cache_entry **cached_out,
|
145
143
|
git_pack_cache *cache,
|
146
144
|
git_rawobj *base,
|
147
|
-
|
145
|
+
off64_t offset)
|
148
146
|
{
|
149
147
|
git_pack_cache_entry *entry;
|
150
|
-
int
|
151
|
-
size_t k;
|
148
|
+
int exists;
|
152
149
|
|
153
150
|
if (base->len > GIT_PACK_CACHE_SIZE_LIMIT)
|
154
151
|
return -1;
|
@@ -166,9 +163,7 @@ static int cache_add(
|
|
166
163
|
while (cache->memory_used + base->len > cache->memory_limit)
|
167
164
|
free_lowest_entry(cache);
|
168
165
|
|
169
|
-
|
170
|
-
assert(error != 0);
|
171
|
-
git_offmap_set_value_at(cache->entries, k, entry);
|
166
|
+
git_offmap_set(cache->entries, offset, entry);
|
172
167
|
cache->memory_used += entry->raw.len;
|
173
168
|
|
174
169
|
*cached_out = entry;
|
@@ -348,7 +343,7 @@ static int pack_index_open(struct git_pack_file *p)
|
|
348
343
|
static unsigned char *pack_window_open(
|
349
344
|
struct git_pack_file *p,
|
350
345
|
git_mwindow **w_cursor,
|
351
|
-
|
346
|
+
off64_t offset,
|
352
347
|
unsigned int *left)
|
353
348
|
{
|
354
349
|
if (p->mwf.fd == -1 && packfile_open(p) < 0)
|
@@ -444,7 +439,7 @@ int git_packfile_unpack_header(
|
|
444
439
|
git_object_t *type_p,
|
445
440
|
git_mwindow_file *mwf,
|
446
441
|
git_mwindow **w_curs,
|
447
|
-
|
442
|
+
off64_t *curpos)
|
448
443
|
{
|
449
444
|
unsigned char *base;
|
450
445
|
unsigned int left;
|
@@ -477,13 +472,13 @@ int git_packfile_resolve_header(
|
|
477
472
|
size_t *size_p,
|
478
473
|
git_object_t *type_p,
|
479
474
|
struct git_pack_file *p,
|
480
|
-
|
475
|
+
off64_t offset)
|
481
476
|
{
|
482
477
|
git_mwindow *w_curs = NULL;
|
483
|
-
|
478
|
+
off64_t curpos = offset;
|
484
479
|
size_t size;
|
485
480
|
git_object_t type;
|
486
|
-
|
481
|
+
off64_t base_offset;
|
487
482
|
int error;
|
488
483
|
|
489
484
|
error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos);
|
@@ -531,13 +526,13 @@ int git_packfile_resolve_header(
|
|
531
526
|
* cache, we stop calculating there.
|
532
527
|
*/
|
533
528
|
static int pack_dependency_chain(git_dependency_chain *chain_out,
|
534
|
-
git_pack_cache_entry **cached_out,
|
529
|
+
git_pack_cache_entry **cached_out, off64_t *cached_off,
|
535
530
|
struct pack_chain_elem *small_stack, size_t *stack_sz,
|
536
|
-
struct git_pack_file *p,
|
531
|
+
struct git_pack_file *p, off64_t obj_offset)
|
537
532
|
{
|
538
533
|
git_dependency_chain chain = GIT_ARRAY_INIT;
|
539
534
|
git_mwindow *w_curs = NULL;
|
540
|
-
|
535
|
+
off64_t curpos = obj_offset, base_offset;
|
541
536
|
int error = 0, use_heap = 0;
|
542
537
|
size_t size, elem_pos;
|
543
538
|
git_object_t type;
|
@@ -622,10 +617,10 @@ on_error:
|
|
622
617
|
int git_packfile_unpack(
|
623
618
|
git_rawobj *obj,
|
624
619
|
struct git_pack_file *p,
|
625
|
-
|
620
|
+
off64_t *obj_offset)
|
626
621
|
{
|
627
622
|
git_mwindow *w_curs = NULL;
|
628
|
-
|
623
|
+
off64_t curpos = *obj_offset;
|
629
624
|
int error, free_base = 0;
|
630
625
|
git_dependency_chain chain = GIT_ARRAY_INIT;
|
631
626
|
struct pack_chain_elem *elem = NULL, *stack;
|
@@ -768,31 +763,13 @@ cleanup:
|
|
768
763
|
return error;
|
769
764
|
}
|
770
765
|
|
771
|
-
|
772
|
-
{
|
773
|
-
GIT_UNUSED(opaq);
|
774
|
-
return git__calloc(count, size);
|
775
|
-
}
|
776
|
-
|
777
|
-
static void use_git_free(void *opaq, void *ptr)
|
766
|
+
int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, off64_t curpos)
|
778
767
|
{
|
779
|
-
GIT_UNUSED(opaq);
|
780
|
-
git__free(ptr);
|
781
|
-
}
|
782
|
-
|
783
|
-
int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, git_off_t curpos)
|
784
|
-
{
|
785
|
-
int st;
|
786
|
-
|
787
768
|
memset(obj, 0, sizeof(git_packfile_stream));
|
788
769
|
obj->curpos = curpos;
|
789
770
|
obj->p = p;
|
790
|
-
|
791
|
-
obj->zstream
|
792
|
-
obj->zstream.next_in = Z_NULL;
|
793
|
-
obj->zstream.next_out = Z_NULL;
|
794
|
-
st = inflateInit(&obj->zstream);
|
795
|
-
if (st != Z_OK) {
|
771
|
+
|
772
|
+
if (git_zstream_init(&obj->zstream, GIT_ZSTREAM_INFLATE) < 0) {
|
796
773
|
git_error_set(GIT_ERROR_ZLIB, "failed to init packfile stream");
|
797
774
|
return -1;
|
798
775
|
}
|
@@ -802,126 +779,116 @@ int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p,
|
|
802
779
|
|
803
780
|
ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len)
|
804
781
|
{
|
782
|
+
unsigned int window_len;
|
805
783
|
unsigned char *in;
|
806
|
-
|
807
|
-
int st;
|
784
|
+
int error;
|
808
785
|
|
809
786
|
if (obj->done)
|
810
787
|
return 0;
|
811
788
|
|
812
|
-
in = pack_window_open(obj->p, &obj->mw, obj->curpos, &
|
813
|
-
if (in == NULL)
|
789
|
+
if ((in = pack_window_open(obj->p, &obj->mw, obj->curpos, &window_len)) == NULL)
|
814
790
|
return GIT_EBUFS;
|
815
791
|
|
816
|
-
obj->zstream
|
817
|
-
|
818
|
-
|
819
|
-
|
820
|
-
st = inflate(&obj->zstream, Z_SYNC_FLUSH);
|
821
|
-
git_mwindow_close(&obj->mw);
|
822
|
-
|
823
|
-
obj->curpos += obj->zstream.next_in - in;
|
824
|
-
written = len - obj->zstream.avail_out;
|
825
|
-
|
826
|
-
if (st != Z_OK && st != Z_STREAM_END) {
|
792
|
+
if ((error = git_zstream_set_input(&obj->zstream, in, window_len)) < 0 ||
|
793
|
+
(error = git_zstream_get_output_chunk(buffer, &len, &obj->zstream)) < 0) {
|
794
|
+
git_mwindow_close(&obj->mw);
|
827
795
|
git_error_set(GIT_ERROR_ZLIB, "error reading from the zlib stream");
|
828
796
|
return -1;
|
829
797
|
}
|
830
798
|
|
831
|
-
|
832
|
-
obj->done = 1;
|
799
|
+
git_mwindow_close(&obj->mw);
|
833
800
|
|
801
|
+
obj->curpos += window_len - obj->zstream.in_len;
|
802
|
+
|
803
|
+
if (git_zstream_eos(&obj->zstream))
|
804
|
+
obj->done = 1;
|
834
805
|
|
835
806
|
/* If we didn't write anything out but we're not done, we need more data */
|
836
|
-
if (!
|
807
|
+
if (!len && !git_zstream_eos(&obj->zstream))
|
837
808
|
return GIT_EBUFS;
|
838
809
|
|
839
|
-
return
|
810
|
+
return len;
|
840
811
|
|
841
812
|
}
|
842
813
|
|
843
814
|
void git_packfile_stream_dispose(git_packfile_stream *obj)
|
844
815
|
{
|
845
|
-
|
816
|
+
git_zstream_free(&obj->zstream);
|
846
817
|
}
|
847
818
|
|
848
819
|
static int packfile_unpack_compressed(
|
849
820
|
git_rawobj *obj,
|
850
821
|
struct git_pack_file *p,
|
851
|
-
git_mwindow **
|
852
|
-
|
822
|
+
git_mwindow **mwindow,
|
823
|
+
off64_t *position,
|
853
824
|
size_t size,
|
854
825
|
git_object_t type)
|
855
826
|
{
|
856
|
-
|
857
|
-
|
858
|
-
|
859
|
-
|
860
|
-
|
861
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&buf_size, size, 1);
|
862
|
-
buffer = git__calloc(1, buf_size);
|
863
|
-
GIT_ERROR_CHECK_ALLOC(buffer);
|
864
|
-
|
865
|
-
memset(&stream, 0, sizeof(stream));
|
866
|
-
stream.next_out = buffer;
|
867
|
-
stream.avail_out = (uInt)buf_size;
|
868
|
-
stream.zalloc = use_git_alloc;
|
869
|
-
stream.zfree = use_git_free;
|
870
|
-
|
871
|
-
st = inflateInit(&stream);
|
872
|
-
if (st != Z_OK) {
|
873
|
-
git__free(buffer);
|
874
|
-
git_error_set(GIT_ERROR_ZLIB, "failed to init zlib stream on unpack");
|
827
|
+
git_zstream zstream = GIT_ZSTREAM_INIT;
|
828
|
+
size_t buffer_len, total = 0;
|
829
|
+
char *data = NULL;
|
830
|
+
int error;
|
875
831
|
|
876
|
-
|
832
|
+
GIT_ERROR_CHECK_ALLOC_ADD(&buffer_len, size, 1);
|
833
|
+
data = git__calloc(1, buffer_len);
|
834
|
+
GIT_ERROR_CHECK_ALLOC(data);
|
835
|
+
|
836
|
+
if ((error = git_zstream_init(&zstream, GIT_ZSTREAM_INFLATE)) < 0) {
|
837
|
+
git_error_set(GIT_ERROR_ZLIB, "failed to init zlib stream on unpack");
|
838
|
+
goto out;
|
877
839
|
}
|
878
840
|
|
879
841
|
do {
|
880
|
-
|
881
|
-
|
882
|
-
|
883
|
-
git_mwindow_close(w_curs);
|
842
|
+
size_t bytes = buffer_len - total;
|
843
|
+
unsigned int window_len;
|
844
|
+
unsigned char *in;
|
884
845
|
|
885
|
-
|
886
|
-
break; /* the payload is larger than it should be */
|
846
|
+
in = pack_window_open(p, mwindow, *position, &window_len);
|
887
847
|
|
888
|
-
if (
|
889
|
-
|
890
|
-
|
891
|
-
|
848
|
+
if ((error = git_zstream_set_input(&zstream, in, window_len)) < 0 ||
|
849
|
+
(error = git_zstream_get_output_chunk(data + total, &bytes, &zstream)) < 0) {
|
850
|
+
git_mwindow_close(mwindow);
|
851
|
+
goto out;
|
892
852
|
}
|
893
853
|
|
894
|
-
|
895
|
-
} while (st == Z_OK || st == Z_BUF_ERROR);
|
854
|
+
git_mwindow_close(mwindow);
|
896
855
|
|
897
|
-
|
856
|
+
*position += window_len - zstream.in_len;
|
857
|
+
total += bytes;
|
858
|
+
} while (total < size);
|
898
859
|
|
899
|
-
if (
|
900
|
-
git__free(buffer);
|
860
|
+
if (total != size || !git_zstream_eos(&zstream)) {
|
901
861
|
git_error_set(GIT_ERROR_ZLIB, "error inflating zlib stream");
|
902
|
-
|
862
|
+
error = -1;
|
863
|
+
goto out;
|
903
864
|
}
|
904
865
|
|
905
866
|
obj->type = type;
|
906
867
|
obj->len = size;
|
907
|
-
obj->data =
|
908
|
-
|
868
|
+
obj->data = data;
|
869
|
+
|
870
|
+
out:
|
871
|
+
git_zstream_free(&zstream);
|
872
|
+
if (error)
|
873
|
+
git__free(data);
|
874
|
+
|
875
|
+
return error;
|
909
876
|
}
|
910
877
|
|
911
878
|
/*
|
912
879
|
* curpos is where the data starts, delta_obj_offset is the where the
|
913
880
|
* header starts
|
914
881
|
*/
|
915
|
-
|
882
|
+
off64_t get_delta_base(
|
916
883
|
struct git_pack_file *p,
|
917
884
|
git_mwindow **w_curs,
|
918
|
-
|
885
|
+
off64_t *curpos,
|
919
886
|
git_object_t type,
|
920
|
-
|
887
|
+
off64_t delta_obj_offset)
|
921
888
|
{
|
922
889
|
unsigned int left = 0;
|
923
890
|
unsigned char *base_info;
|
924
|
-
|
891
|
+
off64_t base_offset;
|
925
892
|
git_oid unused;
|
926
893
|
|
927
894
|
base_info = pack_window_open(p, w_curs, *curpos, &left);
|
@@ -954,14 +921,13 @@ git_off_t get_delta_base(
|
|
954
921
|
} else if (type == GIT_OBJECT_REF_DELTA) {
|
955
922
|
/* If we have the cooperative cache, search in it first */
|
956
923
|
if (p->has_cache) {
|
924
|
+
struct git_pack_entry *entry;
|
957
925
|
git_oid oid;
|
958
|
-
size_t k;
|
959
926
|
|
960
927
|
git_oid_fromraw(&oid, base_info);
|
961
|
-
|
962
|
-
if (git_oidmap_valid_index(p->idx_cache, k)) {
|
928
|
+
if ((entry = git_oidmap_get(p->idx_cache, &oid)) != NULL) {
|
963
929
|
*curpos += 20;
|
964
|
-
return
|
930
|
+
return entry->offset;
|
965
931
|
} else {
|
966
932
|
/* If we're building an index, don't try to find the pack
|
967
933
|
* entry; we just haven't seen it yet. We'll make
|
@@ -1049,7 +1015,7 @@ static int packfile_open(struct git_pack_file *p)
|
|
1049
1015
|
if (!p->mwf.size) {
|
1050
1016
|
if (!S_ISREG(st.st_mode))
|
1051
1017
|
goto cleanup;
|
1052
|
-
p->mwf.size = (
|
1018
|
+
p->mwf.size = (off64_t)st.st_size;
|
1053
1019
|
} else if (p->mwf.size != st.st_size)
|
1054
1020
|
goto cleanup;
|
1055
1021
|
|
@@ -1141,9 +1107,11 @@ int git_packfile_alloc(struct git_pack_file **pack_out, const char *path)
|
|
1141
1107
|
if (git__suffixcmp(path, ".idx") == 0) {
|
1142
1108
|
size_t root_len = path_len - strlen(".idx");
|
1143
1109
|
|
1144
|
-
|
1145
|
-
|
1146
|
-
p->
|
1110
|
+
if (!git_disable_pack_keep_file_checks) {
|
1111
|
+
memcpy(p->pack_name + root_len, ".keep", sizeof(".keep"));
|
1112
|
+
if (git_path_exists(p->pack_name) == true)
|
1113
|
+
p->pack_keep = 1;
|
1114
|
+
}
|
1147
1115
|
|
1148
1116
|
memcpy(p->pack_name + root_len, ".pack", sizeof(".pack"));
|
1149
1117
|
}
|
@@ -1184,7 +1152,7 @@ int git_packfile_alloc(struct git_pack_file **pack_out, const char *path)
|
|
1184
1152
|
*
|
1185
1153
|
***********************************************************/
|
1186
1154
|
|
1187
|
-
static
|
1155
|
+
static off64_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n)
|
1188
1156
|
{
|
1189
1157
|
const unsigned char *index = p->index_map.data;
|
1190
1158
|
const unsigned char *end = index + p->index_map.len;
|
@@ -1272,7 +1240,7 @@ int git_pack_foreach_entry(
|
|
1272
1240
|
}
|
1273
1241
|
|
1274
1242
|
static int pack_entry_find_offset(
|
1275
|
-
|
1243
|
+
off64_t *offset_out,
|
1276
1244
|
git_oid *found_oid,
|
1277
1245
|
struct git_pack_file *p,
|
1278
1246
|
const git_oid *short_oid,
|
@@ -1282,7 +1250,7 @@ static int pack_entry_find_offset(
|
|
1282
1250
|
const unsigned char *index;
|
1283
1251
|
unsigned hi, lo, stride;
|
1284
1252
|
int pos, found = 0;
|
1285
|
-
|
1253
|
+
off64_t offset;
|
1286
1254
|
const unsigned char *current = 0;
|
1287
1255
|
|
1288
1256
|
*offset_out = 0;
|
@@ -1377,7 +1345,7 @@ int git_pack_entry_find(
|
|
1377
1345
|
const git_oid *short_oid,
|
1378
1346
|
size_t len)
|
1379
1347
|
{
|
1380
|
-
|
1348
|
+
off64_t offset;
|
1381
1349
|
git_oid found_oid;
|
1382
1350
|
int error;
|
1383
1351
|
|