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
@@ -0,0 +1,57 @@
|
|
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
|
+
#ifndef INCLUDE_net_h__
|
8
|
+
#define INCLUDE_net_h__
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
|
12
|
+
typedef struct git_net_url {
|
13
|
+
char *scheme;
|
14
|
+
char *host;
|
15
|
+
char *port;
|
16
|
+
char *path;
|
17
|
+
char *query;
|
18
|
+
char *username;
|
19
|
+
char *password;
|
20
|
+
} git_net_url;
|
21
|
+
|
22
|
+
#define GIT_NET_URL_INIT { NULL }
|
23
|
+
|
24
|
+
/** Parses a string containing a URL into a structure. */
|
25
|
+
extern int git_net_url_parse(git_net_url *url, const char *str);
|
26
|
+
|
27
|
+
/** Appends a path and/or query string to the given URL */
|
28
|
+
extern int git_net_url_joinpath(
|
29
|
+
git_net_url *out,
|
30
|
+
git_net_url *in,
|
31
|
+
const char *path);
|
32
|
+
|
33
|
+
/** Ensures that a URL is minimally valid (contains a host, port and path) */
|
34
|
+
extern bool git_net_url_valid(git_net_url *url);
|
35
|
+
|
36
|
+
/** Returns nonzero if the URL is on the default port. */
|
37
|
+
extern int git_net_url_is_default_port(git_net_url *url);
|
38
|
+
|
39
|
+
/* Applies a redirect to the URL with a git-aware service suffix. */
|
40
|
+
extern int git_net_url_apply_redirect(
|
41
|
+
git_net_url *url,
|
42
|
+
const char *redirect_location,
|
43
|
+
const char *service_suffix);
|
44
|
+
|
45
|
+
/** Swaps the contents of one URL for another. */
|
46
|
+
extern void git_net_url_swap(git_net_url *a, git_net_url *b);
|
47
|
+
|
48
|
+
/** Places the URL into the given buffer. */
|
49
|
+
extern int git_net_url_fmt(git_buf *out, git_net_url *url);
|
50
|
+
|
51
|
+
/** Place the path and query string into the given buffer. */
|
52
|
+
extern int git_net_url_fmt_path(git_buf *buf, git_net_url *url);
|
53
|
+
|
54
|
+
/** Disposes the contents of the structure. */
|
55
|
+
extern void git_net_url_dispose(git_net_url *url);
|
56
|
+
|
57
|
+
#endif
|
data/vendor/libgit2/src/netops.c
CHANGED
@@ -37,14 +37,17 @@ void gitno_buffer_setup_callback(
|
|
37
37
|
static int recv_stream(gitno_buffer *buf)
|
38
38
|
{
|
39
39
|
git_stream *io = (git_stream *) buf->cb_data;
|
40
|
-
|
40
|
+
size_t readlen = buf->len - buf->offset;
|
41
|
+
ssize_t ret;
|
41
42
|
|
42
|
-
|
43
|
+
readlen = min(readlen, INT_MAX);
|
44
|
+
|
45
|
+
ret = git_stream_read(io, buf->data + buf->offset, (int)readlen);
|
43
46
|
if (ret < 0)
|
44
47
|
return -1;
|
45
48
|
|
46
49
|
buf->offset += ret;
|
47
|
-
return ret;
|
50
|
+
return (int)ret;
|
48
51
|
}
|
49
52
|
|
50
53
|
void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len)
|
@@ -118,222 +121,3 @@ int gitno__match_host(const char *pattern, const char *host)
|
|
118
121
|
|
119
122
|
return -1;
|
120
123
|
}
|
121
|
-
|
122
|
-
static const char *default_port_http = "80";
|
123
|
-
static const char *default_port_https = "443";
|
124
|
-
|
125
|
-
const char *gitno__default_port(
|
126
|
-
gitno_connection_data *data)
|
127
|
-
{
|
128
|
-
return data->use_ssl ? default_port_https : default_port_http;
|
129
|
-
}
|
130
|
-
|
131
|
-
static const char *prefix_http = "http://";
|
132
|
-
static const char *prefix_https = "https://";
|
133
|
-
|
134
|
-
int gitno_connection_data_from_url(
|
135
|
-
gitno_connection_data *data,
|
136
|
-
const char *url,
|
137
|
-
const char *service_suffix)
|
138
|
-
{
|
139
|
-
int error = -1;
|
140
|
-
const char *default_port = NULL, *path_search_start = NULL;
|
141
|
-
char *original_host = NULL;
|
142
|
-
|
143
|
-
/* service_suffix is optional */
|
144
|
-
assert(data && url);
|
145
|
-
|
146
|
-
/* Save these for comparison later */
|
147
|
-
original_host = data->host;
|
148
|
-
data->host = NULL;
|
149
|
-
gitno_connection_data_free_ptrs(data);
|
150
|
-
|
151
|
-
if (!git__prefixcmp(url, prefix_http)) {
|
152
|
-
path_search_start = url + strlen(prefix_http);
|
153
|
-
default_port = default_port_http;
|
154
|
-
|
155
|
-
if (data->use_ssl) {
|
156
|
-
git_error_set(GIT_ERROR_NET, "redirect from HTTPS to HTTP is not allowed");
|
157
|
-
goto cleanup;
|
158
|
-
}
|
159
|
-
} else if (!git__prefixcmp(url, prefix_https)) {
|
160
|
-
path_search_start = url + strlen(prefix_https);
|
161
|
-
default_port = default_port_https;
|
162
|
-
data->use_ssl = true;
|
163
|
-
} else if (url[0] == '/')
|
164
|
-
default_port = gitno__default_port(data);
|
165
|
-
|
166
|
-
if (!default_port) {
|
167
|
-
git_error_set(GIT_ERROR_NET, "unrecognized URL prefix");
|
168
|
-
goto cleanup;
|
169
|
-
}
|
170
|
-
|
171
|
-
error = gitno_extract_url_parts(
|
172
|
-
&data->host, &data->port, &data->path, &data->user, &data->pass,
|
173
|
-
url, default_port);
|
174
|
-
|
175
|
-
if (url[0] == '/') {
|
176
|
-
/* Relative redirect; reuse original host name and port */
|
177
|
-
path_search_start = url;
|
178
|
-
git__free(data->host);
|
179
|
-
data->host = original_host;
|
180
|
-
original_host = NULL;
|
181
|
-
}
|
182
|
-
|
183
|
-
if (!error) {
|
184
|
-
const char *path = strchr(path_search_start, '/');
|
185
|
-
size_t pathlen = strlen(path);
|
186
|
-
size_t suffixlen = service_suffix ? strlen(service_suffix) : 0;
|
187
|
-
|
188
|
-
if (suffixlen &&
|
189
|
-
!memcmp(path + pathlen - suffixlen, service_suffix, suffixlen)) {
|
190
|
-
git__free(data->path);
|
191
|
-
data->path = git__strndup(path, pathlen - suffixlen);
|
192
|
-
} else {
|
193
|
-
git__free(data->path);
|
194
|
-
data->path = git__strdup(path);
|
195
|
-
}
|
196
|
-
|
197
|
-
/* Check for errors in the resulting data */
|
198
|
-
if (original_host && url[0] != '/' && strcmp(original_host, data->host)) {
|
199
|
-
git_error_set(GIT_ERROR_NET, "cross host redirect not allowed");
|
200
|
-
error = -1;
|
201
|
-
}
|
202
|
-
}
|
203
|
-
|
204
|
-
cleanup:
|
205
|
-
if (original_host) git__free(original_host);
|
206
|
-
return error;
|
207
|
-
}
|
208
|
-
|
209
|
-
int gitno_connection_data_fmt(git_buf *buf, gitno_connection_data *d)
|
210
|
-
{
|
211
|
-
if (d->host) {
|
212
|
-
git_buf_puts(buf, d->use_ssl ? prefix_https : prefix_http);
|
213
|
-
|
214
|
-
if (d->user) {
|
215
|
-
git_buf_puts(buf, d->user);
|
216
|
-
|
217
|
-
if (d->pass) {
|
218
|
-
git_buf_puts(buf, ":");
|
219
|
-
git_buf_puts(buf, d->pass);
|
220
|
-
}
|
221
|
-
|
222
|
-
git_buf_putc(buf, '@');
|
223
|
-
}
|
224
|
-
|
225
|
-
git_buf_puts(buf, d->host);
|
226
|
-
|
227
|
-
if (d->port && strcmp(d->port, gitno__default_port(d))) {
|
228
|
-
git_buf_putc(buf, ':');
|
229
|
-
git_buf_puts(buf, d->port);
|
230
|
-
}
|
231
|
-
}
|
232
|
-
|
233
|
-
git_buf_puts(buf, d->path ? d->path : "/");
|
234
|
-
|
235
|
-
return git_buf_oom(buf) ? -1 : 0;
|
236
|
-
}
|
237
|
-
|
238
|
-
void gitno_connection_data_free_ptrs(gitno_connection_data *d)
|
239
|
-
{
|
240
|
-
git__free(d->host); d->host = NULL;
|
241
|
-
git__free(d->port); d->port = NULL;
|
242
|
-
git__free(d->path); d->path = NULL;
|
243
|
-
git__free(d->user); d->user = NULL;
|
244
|
-
git__free(d->pass); d->pass = NULL;
|
245
|
-
}
|
246
|
-
|
247
|
-
int gitno_extract_url_parts(
|
248
|
-
char **host_out,
|
249
|
-
char **port_out,
|
250
|
-
char **path_out,
|
251
|
-
char **username_out,
|
252
|
-
char **password_out,
|
253
|
-
const char *url,
|
254
|
-
const char *default_port)
|
255
|
-
{
|
256
|
-
struct http_parser_url u = {0};
|
257
|
-
bool has_host, has_port, has_path, has_userinfo;
|
258
|
-
git_buf host = GIT_BUF_INIT,
|
259
|
-
port = GIT_BUF_INIT,
|
260
|
-
path = GIT_BUF_INIT,
|
261
|
-
username = GIT_BUF_INIT,
|
262
|
-
password = GIT_BUF_INIT;
|
263
|
-
int error = 0;
|
264
|
-
|
265
|
-
if (http_parser_parse_url(url, strlen(url), false, &u)) {
|
266
|
-
git_error_set(GIT_ERROR_NET, "malformed URL '%s'", url);
|
267
|
-
error = GIT_EINVALIDSPEC;
|
268
|
-
goto done;
|
269
|
-
}
|
270
|
-
|
271
|
-
has_host = !!(u.field_set & (1 << UF_HOST));
|
272
|
-
has_port = !!(u.field_set & (1 << UF_PORT));
|
273
|
-
has_path = !!(u.field_set & (1 << UF_PATH));
|
274
|
-
has_userinfo = !!(u.field_set & (1 << UF_USERINFO));
|
275
|
-
|
276
|
-
if (has_host) {
|
277
|
-
const char *url_host = url + u.field_data[UF_HOST].off;
|
278
|
-
size_t url_host_len = u.field_data[UF_HOST].len;
|
279
|
-
git_buf_decode_percent(&host, url_host, url_host_len);
|
280
|
-
}
|
281
|
-
|
282
|
-
if (has_port) {
|
283
|
-
const char *url_port = url + u.field_data[UF_PORT].off;
|
284
|
-
size_t url_port_len = u.field_data[UF_PORT].len;
|
285
|
-
git_buf_put(&port, url_port, url_port_len);
|
286
|
-
} else {
|
287
|
-
git_buf_puts(&port, default_port);
|
288
|
-
}
|
289
|
-
|
290
|
-
if (has_path && path_out) {
|
291
|
-
const char *url_path = url + u.field_data[UF_PATH].off;
|
292
|
-
size_t url_path_len = u.field_data[UF_PATH].len;
|
293
|
-
git_buf_decode_percent(&path, url_path, url_path_len);
|
294
|
-
} else if (path_out) {
|
295
|
-
git_error_set(GIT_ERROR_NET, "invalid url, missing path");
|
296
|
-
error = GIT_EINVALIDSPEC;
|
297
|
-
goto done;
|
298
|
-
}
|
299
|
-
|
300
|
-
if (has_userinfo) {
|
301
|
-
const char *url_userinfo = url + u.field_data[UF_USERINFO].off;
|
302
|
-
size_t url_userinfo_len = u.field_data[UF_USERINFO].len;
|
303
|
-
const char *colon = memchr(url_userinfo, ':', url_userinfo_len);
|
304
|
-
|
305
|
-
if (colon) {
|
306
|
-
const char *url_username = url_userinfo;
|
307
|
-
size_t url_username_len = colon - url_userinfo;
|
308
|
-
const char *url_password = colon + 1;
|
309
|
-
size_t url_password_len = url_userinfo_len - (url_username_len + 1);
|
310
|
-
|
311
|
-
git_buf_decode_percent(&username, url_username, url_username_len);
|
312
|
-
git_buf_decode_percent(&password, url_password, url_password_len);
|
313
|
-
} else {
|
314
|
-
git_buf_decode_percent(&username, url_userinfo, url_userinfo_len);
|
315
|
-
}
|
316
|
-
}
|
317
|
-
|
318
|
-
if (git_buf_oom(&host) ||
|
319
|
-
git_buf_oom(&port) ||
|
320
|
-
git_buf_oom(&path) ||
|
321
|
-
git_buf_oom(&username) ||
|
322
|
-
git_buf_oom(&password))
|
323
|
-
return -1;
|
324
|
-
|
325
|
-
*host_out = git_buf_detach(&host);
|
326
|
-
*port_out = git_buf_detach(&port);
|
327
|
-
if (path_out)
|
328
|
-
*path_out = git_buf_detach(&path);
|
329
|
-
*username_out = git_buf_detach(&username);
|
330
|
-
*password_out = git_buf_detach(&password);
|
331
|
-
|
332
|
-
done:
|
333
|
-
git_buf_dispose(&host);
|
334
|
-
git_buf_dispose(&port);
|
335
|
-
git_buf_dispose(&path);
|
336
|
-
git_buf_dispose(&username);
|
337
|
-
git_buf_dispose(&password);
|
338
|
-
return error;
|
339
|
-
}
|
data/vendor/libgit2/src/netops.h
CHANGED
@@ -11,6 +11,7 @@
|
|
11
11
|
|
12
12
|
#include "posix.h"
|
13
13
|
#include "stream.h"
|
14
|
+
#include "net.h"
|
14
15
|
|
15
16
|
#ifdef GIT_OPENSSL
|
16
17
|
# include <openssl/ssl.h>
|
@@ -64,41 +65,4 @@ int gitno_recv(gitno_buffer *buf);
|
|
64
65
|
void gitno_consume(gitno_buffer *buf, const char *ptr);
|
65
66
|
void gitno_consume_n(gitno_buffer *buf, size_t cons);
|
66
67
|
|
67
|
-
typedef struct gitno_connection_data {
|
68
|
-
char *host;
|
69
|
-
char *port;
|
70
|
-
char *path;
|
71
|
-
char *user;
|
72
|
-
char *pass;
|
73
|
-
bool use_ssl;
|
74
|
-
} gitno_connection_data;
|
75
|
-
|
76
|
-
/*
|
77
|
-
* This replaces all the pointers in `data` with freshly-allocated strings,
|
78
|
-
* that the caller is responsible for freeing.
|
79
|
-
* `gitno_connection_data_free_ptrs` is good for this.
|
80
|
-
*/
|
81
|
-
|
82
|
-
int gitno_connection_data_from_url(
|
83
|
-
gitno_connection_data *data,
|
84
|
-
const char *url,
|
85
|
-
const char *service_suffix);
|
86
|
-
|
87
|
-
/* Format a URL into a buffer */
|
88
|
-
int gitno_connection_data_fmt(git_buf *buf, gitno_connection_data *data);
|
89
|
-
|
90
|
-
/* This frees all the pointers IN the struct, but not the struct itself. */
|
91
|
-
void gitno_connection_data_free_ptrs(gitno_connection_data *data);
|
92
|
-
|
93
|
-
int gitno_extract_url_parts(
|
94
|
-
char **host,
|
95
|
-
char **port,
|
96
|
-
char **path,
|
97
|
-
char **username,
|
98
|
-
char **password,
|
99
|
-
const char *url,
|
100
|
-
const char *default_port);
|
101
|
-
|
102
|
-
const char *gitno__default_port(gitno_connection_data *data);
|
103
|
-
|
104
68
|
#endif
|
data/vendor/libgit2/src/notes.c
CHANGED
@@ -288,7 +288,7 @@ static int note_write(
|
|
288
288
|
|
289
289
|
/* TODO: should we apply filters? */
|
290
290
|
/* create note object */
|
291
|
-
if ((error =
|
291
|
+
if ((error = git_blob_create_from_buffer(&oid, repo, note, strlen(note))) < 0)
|
292
292
|
goto cleanup;
|
293
293
|
|
294
294
|
if ((error = manipulate_note_in_tree_r(
|
@@ -320,7 +320,7 @@ static int note_new(
|
|
320
320
|
git_blob *blob)
|
321
321
|
{
|
322
322
|
git_note *note = NULL;
|
323
|
-
|
323
|
+
git_object_size_t blobsize;
|
324
324
|
|
325
325
|
note = git__malloc(sizeof(git_note));
|
326
326
|
GIT_ERROR_CHECK_ALLOC(note);
|
data/vendor/libgit2/src/object.c
CHANGED
@@ -21,6 +21,7 @@
|
|
21
21
|
bool git_object__strict_input_validation = true;
|
22
22
|
|
23
23
|
extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
|
24
|
+
size_t git_object__size(git_object_t type);
|
24
25
|
|
25
26
|
typedef struct {
|
26
27
|
const char *str; /* type name string */
|
@@ -200,7 +201,7 @@ int git_object_lookup_prefix(
|
|
200
201
|
if (type != GIT_OBJECT_ANY && type != object->cached.type) {
|
201
202
|
git_object_free(object);
|
202
203
|
git_error_set(GIT_ERROR_INVALID,
|
203
|
-
"the requested type does not match the type in ODB");
|
204
|
+
"the requested type does not match the type in the ODB");
|
204
205
|
return GIT_ENOTFOUND;
|
205
206
|
}
|
206
207
|
|
@@ -496,7 +497,7 @@ int git_object_short_id(git_buf *out, const git_object *obj)
|
|
496
497
|
git_buf_sanitize(out);
|
497
498
|
repo = git_object_owner(obj);
|
498
499
|
|
499
|
-
if ((error =
|
500
|
+
if ((error = git_repository__configmap_lookup(&len, repo, GIT_CONFIGMAP_ABBREV)) < 0)
|
500
501
|
return error;
|
501
502
|
|
502
503
|
if ((error = git_repository_odb(&odb, repo)) < 0)
|
@@ -549,4 +550,3 @@ bool git_object__is_valid(
|
|
549
550
|
|
550
551
|
return true;
|
551
552
|
}
|
552
|
-
|
data/vendor/libgit2/src/object.h
CHANGED
data/vendor/libgit2/src/odb.c
CHANGED
@@ -10,7 +10,7 @@
|
|
10
10
|
#include <zlib.h>
|
11
11
|
#include "git2/object.h"
|
12
12
|
#include "git2/sys/odb_backend.h"
|
13
|
-
#include "
|
13
|
+
#include "futils.h"
|
14
14
|
#include "hash.h"
|
15
15
|
#include "delta.h"
|
16
16
|
#include "filter.h"
|
@@ -89,7 +89,7 @@ int git_odb__format_object_header(
|
|
89
89
|
size_t *written,
|
90
90
|
char *hdr,
|
91
91
|
size_t hdr_size,
|
92
|
-
|
92
|
+
git_object_size_t obj_len,
|
93
93
|
git_object_t obj_type)
|
94
94
|
{
|
95
95
|
const char *type_str = git_object_type2string(obj_type);
|
@@ -320,20 +320,26 @@ int git_odb__hashlink(git_oid *out, const char *path)
|
|
320
320
|
|
321
321
|
int git_odb_hashfile(git_oid *out, const char *path, git_object_t type)
|
322
322
|
{
|
323
|
-
|
324
|
-
int
|
325
|
-
|
323
|
+
uint64_t size;
|
324
|
+
int fd, error = 0;
|
325
|
+
|
326
|
+
if ((fd = git_futils_open_ro(path)) < 0)
|
326
327
|
return fd;
|
327
328
|
|
328
|
-
if ((
|
329
|
+
if ((error = git_futils_filesize(&size, fd)) < 0)
|
330
|
+
goto done;
|
331
|
+
|
332
|
+
if (!git__is_sizet(size)) {
|
329
333
|
git_error_set(GIT_ERROR_OS, "file size overflow for 32-bit systems");
|
330
|
-
|
331
|
-
|
334
|
+
error = -1;
|
335
|
+
goto done;
|
332
336
|
}
|
333
337
|
|
334
|
-
|
338
|
+
error = git_odb__hashfd(out, fd, (size_t)size, type);
|
339
|
+
|
340
|
+
done:
|
335
341
|
p_close(fd);
|
336
|
-
return
|
342
|
+
return error;
|
337
343
|
}
|
338
344
|
|
339
345
|
int git_odb_hash(git_oid *id, const void *data, size_t len, git_object_t type)
|
@@ -385,7 +391,7 @@ static void fake_wstream__free(git_odb_stream *_stream)
|
|
385
391
|
git__free(stream);
|
386
392
|
}
|
387
393
|
|
388
|
-
static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend,
|
394
|
+
static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_object_size_t size, git_object_t type)
|
389
395
|
{
|
390
396
|
fake_wstream *stream;
|
391
397
|
size_t blobsize;
|
@@ -448,7 +454,7 @@ int git_odb_new(git_odb **out)
|
|
448
454
|
return -1;
|
449
455
|
}
|
450
456
|
if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
|
451
|
-
|
457
|
+
git_cache_dispose(&db->own_cache);
|
452
458
|
git__free(db);
|
453
459
|
return -1;
|
454
460
|
}
|
@@ -548,6 +554,7 @@ int git_odb__add_default_backends(
|
|
548
554
|
#else
|
549
555
|
if (p_stat(objects_dir, &st) < 0) {
|
550
556
|
if (as_alternates)
|
557
|
+
/* this should warn */
|
551
558
|
return 0;
|
552
559
|
|
553
560
|
git_error_set(GIT_ERROR_ODB, "failed to load object database in '%s'", objects_dir);
|
@@ -665,7 +672,7 @@ int git_odb__set_caps(git_odb *odb, int caps)
|
|
665
672
|
return -1;
|
666
673
|
}
|
667
674
|
|
668
|
-
if (!
|
675
|
+
if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_FSYNCOBJECTFILES))
|
669
676
|
odb->do_fsync = !!val;
|
670
677
|
}
|
671
678
|
|
@@ -686,7 +693,7 @@ static void odb_free(git_odb *db)
|
|
686
693
|
}
|
687
694
|
|
688
695
|
git_vector_free(&db->backends);
|
689
|
-
|
696
|
+
git_cache_dispose(&db->own_cache);
|
690
697
|
|
691
698
|
git__memzero(db, sizeof(*db));
|
692
699
|
git__free(db);
|
@@ -766,7 +773,7 @@ int git_odb_exists(git_odb *db, const git_oid *id)
|
|
766
773
|
|
767
774
|
assert(db && id);
|
768
775
|
|
769
|
-
if (
|
776
|
+
if (git_oid_is_zero(id))
|
770
777
|
return 0;
|
771
778
|
|
772
779
|
if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
|
@@ -994,7 +1001,7 @@ int git_odb__read_header_or_object(
|
|
994
1001
|
|
995
1002
|
*out = NULL;
|
996
1003
|
|
997
|
-
if (
|
1004
|
+
if (git_oid_is_zero(id))
|
998
1005
|
return error_null_oid(GIT_ENOTFOUND, "cannot read object");
|
999
1006
|
|
1000
1007
|
if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
|
@@ -1099,7 +1106,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id)
|
|
1099
1106
|
|
1100
1107
|
assert(out && db && id);
|
1101
1108
|
|
1102
|
-
if (
|
1109
|
+
if (git_oid_is_zero(id))
|
1103
1110
|
return error_null_oid(GIT_ENOTFOUND, "cannot read object");
|
1104
1111
|
|
1105
1112
|
*out = git_cache_get_raw(odb_cache(db), id);
|
@@ -1123,7 +1130,7 @@ static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id)
|
|
1123
1130
|
size_t _unused;
|
1124
1131
|
int error;
|
1125
1132
|
|
1126
|
-
if (
|
1133
|
+
if (git_oid_is_zero(id))
|
1127
1134
|
return error_null_oid(GIT_ENOTFOUND, "cannot get object type");
|
1128
1135
|
|
1129
1136
|
if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
|
@@ -1283,7 +1290,7 @@ int git_odb_write(
|
|
1283
1290
|
|
1284
1291
|
git_odb_hash(oid, data, len, type);
|
1285
1292
|
|
1286
|
-
if (
|
1293
|
+
if (git_oid_is_zero(oid))
|
1287
1294
|
return error_null_oid(GIT_EINVALID, "cannot write object");
|
1288
1295
|
|
1289
1296
|
if (git_odb__freshen(db, oid))
|
@@ -1318,7 +1325,7 @@ int git_odb_write(
|
|
1318
1325
|
return error;
|
1319
1326
|
}
|
1320
1327
|
|
1321
|
-
static int hash_header(git_hash_ctx *ctx,
|
1328
|
+
static int hash_header(git_hash_ctx *ctx, git_object_size_t size, git_object_t type)
|
1322
1329
|
{
|
1323
1330
|
char header[64];
|
1324
1331
|
size_t hdrlen;
|
@@ -1332,7 +1339,7 @@ static int hash_header(git_hash_ctx *ctx, git_off_t size, git_object_t type)
|
|
1332
1339
|
}
|
1333
1340
|
|
1334
1341
|
int git_odb_open_wstream(
|
1335
|
-
git_odb_stream **stream, git_odb *db,
|
1342
|
+
git_odb_stream **stream, git_odb *db, git_object_size_t size, git_object_t type)
|
1336
1343
|
{
|
1337
1344
|
size_t i, writes = 0;
|
1338
1345
|
int error = GIT_ERROR;
|
@@ -1468,7 +1475,7 @@ int git_odb_open_rstream(
|
|
1468
1475
|
return error;
|
1469
1476
|
}
|
1470
1477
|
|
1471
|
-
int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db,
|
1478
|
+
int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_indexer_progress_cb progress_cb, void *progress_payload)
|
1472
1479
|
{
|
1473
1480
|
size_t i, writes = 0;
|
1474
1481
|
int error = GIT_ERROR;
|
@@ -1497,12 +1504,23 @@ int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer
|
|
1497
1504
|
return error;
|
1498
1505
|
}
|
1499
1506
|
|
1500
|
-
void *
|
1507
|
+
void *git_odb_backend_data_alloc(git_odb_backend *backend, size_t len)
|
1501
1508
|
{
|
1502
1509
|
GIT_UNUSED(backend);
|
1503
1510
|
return git__malloc(len);
|
1504
1511
|
}
|
1505
1512
|
|
1513
|
+
void *git_odb_backend_malloc(git_odb_backend *backend, size_t len)
|
1514
|
+
{
|
1515
|
+
return git_odb_backend_data_alloc(backend, len);
|
1516
|
+
}
|
1517
|
+
|
1518
|
+
void git_odb_backend_data_free(git_odb_backend *backend, void *data)
|
1519
|
+
{
|
1520
|
+
GIT_UNUSED(backend);
|
1521
|
+
git__free(data);
|
1522
|
+
}
|
1523
|
+
|
1506
1524
|
int git_odb_refresh(struct git_odb *db)
|
1507
1525
|
{
|
1508
1526
|
size_t i;
|