rugged 0.28.5 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- 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 +18 -16
- data/ext/rugged/rugged_config.c +1 -1
- 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 +32 -8
- data/ext/rugged/rugged_repo.c +232 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/commit.rb +17 -4
- data/lib/rugged/repository.rb +5 -6
- data/lib/rugged/submodule_collection.rb +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +57 -75
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/{Modules/AddCFlagIfSupported.cmake → AddCFlagIfSupported.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/EnableWarnings.cmake → EnableWarnings.cmake} +5 -1
- data/vendor/libgit2/cmake/{Modules/FindCoreFoundation.cmake → FindCoreFoundation.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindGSSAPI.cmake → FindGSSAPI.cmake} +1 -1
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/{Modules/FindHTTP_Parser.cmake → FindHTTP_Parser.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindIconv.cmake → FindIconv.cmake} +0 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/{Modules/FindPkgLibraries.cmake → FindPkgLibraries.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindSecurity.cmake → FindSecurity.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindStatNsec.cmake → FindStatNsec.cmake} +6 -0
- data/vendor/libgit2/cmake/{Modules/FindmbedTLS.cmake → FindmbedTLS.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/IdeSplitSources.cmake → IdeSplitSources.cmake} +0 -0
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +77 -0
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -0
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +48 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +120 -0
- data/vendor/libgit2/cmake/SelectHashes.cmake +61 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +4 -3
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +25 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +28 -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 +1419 -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 +35 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +15 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/LICENCE +93 -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 +9812 -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 +420 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -5
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/deps/zlib/deflate.c +1 -0
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +1 -1
- data/vendor/libgit2/include/git2/apply.h +24 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +4 -2
- data/vendor/libgit2/include/git2/blob.h +61 -13
- 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 +34 -8
- data/vendor/libgit2/include/git2/config.h +13 -13
- 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 +362 -4
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +17 -15
- data/vendor/libgit2/include/git2/errors.h +5 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +5 -5
- data/vendor/libgit2/include/git2/indexer.h +49 -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 +18 -22
- 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 +13 -2
- 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 +22 -3
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +124 -58
- 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/strarray.h +6 -10
- 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 +164 -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 +7 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +5 -5
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +147 -272
- 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 +36 -16
- data/vendor/libgit2/src/assert_safe.h +58 -0
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +197 -99
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +48 -49
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +34 -15
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +27 -10
- data/vendor/libgit2/src/blob.c +92 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +68 -42
- data/vendor/libgit2/src/buffer.c +11 -3
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +34 -58
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +73 -86
- data/vendor/libgit2/src/cherrypick.c +9 -1
- data/vendor/libgit2/src/clone.c +130 -27
- 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 +4 -75
- data/vendor/libgit2/src/config.c +34 -47
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +42 -39
- data/vendor/libgit2/src/config_entries.c +76 -98
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +346 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +50 -30
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +207 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +26 -21
- data/vendor/libgit2/src/diff.c +53 -75
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +15 -11
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +36 -37
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +3 -4
- data/vendor/libgit2/src/diff_print.c +86 -71
- data/vendor/libgit2/src/diff_stats.c +13 -12
- data/vendor/libgit2/src/diff_tform.c +15 -16
- data/vendor/libgit2/src/errors.c +23 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +9 -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 +19 -11
- data/vendor/libgit2/src/{fileops.c → futils.c} +23 -20
- data/vendor/libgit2/src/{fileops.h → futils.h} +8 -8
- data/vendor/libgit2/src/global.c +3 -1
- 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/{sha1_lookup.h → hash/sha1/collisiondetect.h} +8 -8
- 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/{refdb_fs.h → hash/sha1/openssl.h} +8 -8
- 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 +73 -69
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +123 -95
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +99 -78
- data/vendor/libgit2/src/integer.h +26 -4
- data/vendor/libgit2/src/iterator.c +36 -32
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +93 -57
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +5 -7
- data/vendor/libgit2/src/midx.c +418 -0
- data/vendor/libgit2/src/midx.h +83 -0
- data/vendor/libgit2/src/mwindow.c +144 -74
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +416 -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 +8 -5
- data/vendor/libgit2/src/object.c +5 -4
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +54 -32
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +20 -13
- data/vendor/libgit2/src/odb_mempack.c +15 -24
- data/vendor/libgit2/src/odb_pack.c +4 -5
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +21 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +55 -52
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +160 -149
- data/vendor/libgit2/src/pack.h +32 -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 +2 -4
- data/vendor/libgit2/src/patch_parse.c +34 -11
- data/vendor/libgit2/src/path.c +47 -10
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +18 -17
- data/vendor/libgit2/src/pool.c +42 -32
- data/vendor/libgit2/src/pool.h +15 -7
- data/vendor/libgit2/src/posix.c +39 -16
- data/vendor/libgit2/src/posix.h +21 -1
- data/vendor/libgit2/src/proxy.c +9 -2
- data/vendor/libgit2/src/push.c +15 -7
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +89 -28
- data/vendor/libgit2/src/refdb.c +147 -0
- data/vendor/libgit2/src/refdb.h +69 -0
- data/vendor/libgit2/src/refdb_fs.c +230 -241
- data/vendor/libgit2/src/reflog.c +13 -19
- data/vendor/libgit2/src/refs.c +113 -217
- data/vendor/libgit2/src/refs.h +10 -21
- data/vendor/libgit2/src/refspec.c +57 -48
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +102 -79
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +322 -203
- data/vendor/libgit2/src/repository.h +49 -57
- data/vendor/libgit2/src/revert.c +8 -1
- data/vendor/libgit2/src/revparse.c +23 -23
- data/vendor/libgit2/src/revwalk.c +73 -37
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +22 -1
- data/vendor/libgit2/src/sortedcache.c +14 -29
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +49 -67
- data/vendor/libgit2/src/status.c +19 -11
- data/vendor/libgit2/src/strarray.c +63 -0
- data/vendor/libgit2/src/streams/openssl.c +66 -8
- data/vendor/libgit2/src/streams/registry.c +5 -3
- 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 +157 -130
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +4 -20
- data/vendor/libgit2/src/sysdir.h +0 -11
- data/vendor/libgit2/src/tag.c +12 -2
- data/vendor/libgit2/src/thread-utils.h +163 -40
- 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 +5 -9
- 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 +478 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +23 -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 +1552 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +12 -12
- data/vendor/libgit2/src/transports/smart.c +21 -21
- 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 +368 -285
- 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 +16 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +75 -110
- data/vendor/libgit2/src/util.h +18 -23
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/git2.rc +18 -3
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +42 -5
- data/vendor/libgit2/src/win32/path_w32.h +15 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +117 -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 +91 -50
- 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 +123 -53
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +0 -29
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +0 -96
- 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/sha1_lookup.c +0 -35
- data/vendor/libgit2/src/transports/cred.c +0 -390
@@ -8,10 +8,10 @@
|
|
8
8
|
#define INCLUDE_integer_h__
|
9
9
|
|
10
10
|
/** @return true if p fits into the range of a size_t */
|
11
|
-
GIT_INLINE(int) git__is_sizet(
|
11
|
+
GIT_INLINE(int) git__is_sizet(int64_t p)
|
12
12
|
{
|
13
13
|
size_t r = (size_t)p;
|
14
|
-
return p == (
|
14
|
+
return p == (int64_t)r;
|
15
15
|
}
|
16
16
|
|
17
17
|
/** @return true if p fits into the range of an ssize_t */
|
@@ -21,6 +21,13 @@ GIT_INLINE(int) git__is_ssizet(size_t p)
|
|
21
21
|
return p == (size_t)r;
|
22
22
|
}
|
23
23
|
|
24
|
+
/** @return true if p fits into the range of a uint16_t */
|
25
|
+
GIT_INLINE(int) git__is_uint16(size_t p)
|
26
|
+
{
|
27
|
+
uint16_t r = (uint16_t)p;
|
28
|
+
return p == (size_t)r;
|
29
|
+
}
|
30
|
+
|
24
31
|
/** @return true if p fits into the range of a uint32_t */
|
25
32
|
GIT_INLINE(int) git__is_uint32(size_t p)
|
26
33
|
{
|
@@ -29,10 +36,10 @@ GIT_INLINE(int) git__is_uint32(size_t p)
|
|
29
36
|
}
|
30
37
|
|
31
38
|
/** @return true if p fits into the range of an unsigned long */
|
32
|
-
GIT_INLINE(int) git__is_ulong(
|
39
|
+
GIT_INLINE(int) git__is_ulong(int64_t p)
|
33
40
|
{
|
34
41
|
unsigned long r = (unsigned long)p;
|
35
|
-
return p == (
|
42
|
+
return p == (int64_t)r;
|
36
43
|
}
|
37
44
|
|
38
45
|
/** @return true if p fits into the range of an int */
|
@@ -70,6 +77,9 @@ GIT_INLINE(int) git__is_int(long long p)
|
|
70
77
|
# define git__sub_int_overflow(out, one, two) \
|
71
78
|
__builtin_ssub_overflow(one, two, out)
|
72
79
|
|
80
|
+
# define git__add_int64_overflow(out, one, two) \
|
81
|
+
__builtin_add_overflow(one, two, out)
|
82
|
+
|
73
83
|
/* Use Microsoft's safe integer handling functions where available */
|
74
84
|
#elif defined(_MSC_VER)
|
75
85
|
|
@@ -85,6 +95,9 @@ GIT_INLINE(int) git__is_int(long long p)
|
|
85
95
|
#define git__sub_int_overflow(out, one, two) \
|
86
96
|
(IntSub(one, two, out) != S_OK)
|
87
97
|
|
98
|
+
#define git__add_int64_overflow(out, one, two) \
|
99
|
+
(LongLongAdd(one, two, out) != S_OK)
|
100
|
+
|
88
101
|
#else
|
89
102
|
|
90
103
|
/**
|
@@ -129,6 +142,15 @@ GIT_INLINE(bool) git__sub_int_overflow(int *out, int one, int two)
|
|
129
142
|
return false;
|
130
143
|
}
|
131
144
|
|
145
|
+
GIT_INLINE(bool) git__add_int64_overflow(int64_t *out, int64_t one, int64_t two)
|
146
|
+
{
|
147
|
+
if ((two > 0 && one > (INT64_MAX - two)) ||
|
148
|
+
(two < 0 && one < (INT64_MIN - two)))
|
149
|
+
return true;
|
150
|
+
*out = one + two;
|
151
|
+
return false;
|
152
|
+
}
|
153
|
+
|
132
154
|
#endif
|
133
155
|
|
134
156
|
#endif
|
@@ -145,7 +145,7 @@ static int iterator_init_common(
|
|
145
145
|
(iter->flags & GIT_ITERATOR_PRECOMPOSE_UNICODE) == 0 &&
|
146
146
|
(iter->flags & GIT_ITERATOR_DONT_PRECOMPOSE_UNICODE) == 0) {
|
147
147
|
|
148
|
-
if (
|
148
|
+
if (git_repository__configmap_lookup(&precompose, repo, GIT_CONFIGMAP_PRECOMPOSE) < 0)
|
149
149
|
git_error_clear();
|
150
150
|
else if (precompose)
|
151
151
|
iter->flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE;
|
@@ -405,7 +405,7 @@ int git_iterator_for_nothing(
|
|
405
405
|
iter = git__calloc(1, sizeof(empty_iterator));
|
406
406
|
GIT_ERROR_CHECK_ALLOC(iter);
|
407
407
|
|
408
|
-
iter->base.type =
|
408
|
+
iter->base.type = GIT_ITERATOR_EMPTY;
|
409
409
|
iter->base.cb = &callbacks;
|
410
410
|
iter->base.flags = options->flags;
|
411
411
|
|
@@ -897,9 +897,8 @@ static int tree_iterator_init(tree_iterator *iter)
|
|
897
897
|
{
|
898
898
|
int error;
|
899
899
|
|
900
|
-
git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry))
|
901
|
-
|
902
|
-
if ((error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0)
|
900
|
+
if ((error = git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry))) < 0 ||
|
901
|
+
(error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0)
|
903
902
|
return error;
|
904
903
|
|
905
904
|
iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;
|
@@ -950,7 +949,7 @@ int git_iterator_for_tree(
|
|
950
949
|
iter = git__calloc(1, sizeof(tree_iterator));
|
951
950
|
GIT_ERROR_CHECK_ALLOC(iter);
|
952
951
|
|
953
|
-
iter->base.type =
|
952
|
+
iter->base.type = GIT_ITERATOR_TREE;
|
954
953
|
iter->base.cb = &callbacks;
|
955
954
|
|
956
955
|
if ((error = iterator_init_common(&iter->base,
|
@@ -974,7 +973,7 @@ int git_iterator_current_tree_entry(
|
|
974
973
|
tree_iterator_frame *frame;
|
975
974
|
tree_iterator_entry *entry;
|
976
975
|
|
977
|
-
assert(i->type ==
|
976
|
+
assert(i->type == GIT_ITERATOR_TREE);
|
978
977
|
|
979
978
|
iter = (tree_iterator *)i;
|
980
979
|
|
@@ -991,7 +990,7 @@ int git_iterator_current_parent_tree(
|
|
991
990
|
tree_iterator *iter;
|
992
991
|
tree_iterator_frame *frame;
|
993
992
|
|
994
|
-
assert(i->type ==
|
993
|
+
assert(i->type == GIT_ITERATOR_TREE);
|
995
994
|
|
996
995
|
iter = (tree_iterator *)i;
|
997
996
|
|
@@ -1271,7 +1270,7 @@ static int filesystem_iterator_entry_hash(
|
|
1271
1270
|
return 0;
|
1272
1271
|
}
|
1273
1272
|
|
1274
|
-
if (iter->base.type ==
|
1273
|
+
if (iter->base.type == GIT_ITERATOR_WORKDIR)
|
1275
1274
|
return git_repository_hashfile(&entry->id,
|
1276
1275
|
iter->base.repo, entry->path, GIT_OBJECT_BLOB, NULL);
|
1277
1276
|
|
@@ -1376,7 +1375,8 @@ static int filesystem_iterator_frame_push(
|
|
1376
1375
|
filesystem_iterator_entry_cmp)) < 0)
|
1377
1376
|
goto done;
|
1378
1377
|
|
1379
|
-
git_pool_init(&new_frame->entry_pool, 1)
|
1378
|
+
if ((error = git_pool_init(&new_frame->entry_pool, 1)) < 0)
|
1379
|
+
goto done;
|
1380
1380
|
|
1381
1381
|
/* check if this directory is ignored */
|
1382
1382
|
filesystem_iterator_frame_push_ignores(iter, frame_entry, new_frame);
|
@@ -1522,7 +1522,7 @@ static void filesystem_iterator_set_current(
|
|
1522
1522
|
static int filesystem_iterator_current(
|
1523
1523
|
const git_index_entry **out, git_iterator *i)
|
1524
1524
|
{
|
1525
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1525
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1526
1526
|
|
1527
1527
|
if (!iterator__has_been_accessed(i))
|
1528
1528
|
return iter->base.cb->advance(out, i);
|
@@ -1569,7 +1569,7 @@ done:
|
|
1569
1569
|
static int filesystem_iterator_advance(
|
1570
1570
|
const git_index_entry **out, git_iterator *i)
|
1571
1571
|
{
|
1572
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1572
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1573
1573
|
bool is_dir;
|
1574
1574
|
int error = 0;
|
1575
1575
|
|
@@ -1628,7 +1628,7 @@ static int filesystem_iterator_advance(
|
|
1628
1628
|
static int filesystem_iterator_advance_into(
|
1629
1629
|
const git_index_entry **out, git_iterator *i)
|
1630
1630
|
{
|
1631
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1631
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1632
1632
|
filesystem_iterator_frame *frame;
|
1633
1633
|
filesystem_iterator_entry *prev_entry;
|
1634
1634
|
int error;
|
@@ -1665,11 +1665,11 @@ static int filesystem_iterator_advance_into(
|
|
1665
1665
|
|
1666
1666
|
int git_iterator_current_workdir_path(git_buf **out, git_iterator *i)
|
1667
1667
|
{
|
1668
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1668
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1669
1669
|
const git_index_entry *entry;
|
1670
1670
|
|
1671
|
-
if (i->type !=
|
1672
|
-
i->type !=
|
1671
|
+
if (i->type != GIT_ITERATOR_FS &&
|
1672
|
+
i->type != GIT_ITERATOR_WORKDIR) {
|
1673
1673
|
*out = NULL;
|
1674
1674
|
return 0;
|
1675
1675
|
}
|
@@ -1725,18 +1725,22 @@ GIT_INLINE(bool) filesystem_iterator_current_is_ignored(
|
|
1725
1725
|
|
1726
1726
|
bool git_iterator_current_is_ignored(git_iterator *i)
|
1727
1727
|
{
|
1728
|
-
|
1728
|
+
filesystem_iterator *iter = NULL;
|
1729
|
+
|
1730
|
+
if (i->type != GIT_ITERATOR_WORKDIR)
|
1729
1731
|
return false;
|
1730
1732
|
|
1731
|
-
|
1733
|
+
iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1734
|
+
|
1735
|
+
return filesystem_iterator_current_is_ignored(iter);
|
1732
1736
|
}
|
1733
1737
|
|
1734
1738
|
bool git_iterator_current_tree_is_ignored(git_iterator *i)
|
1735
1739
|
{
|
1736
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1740
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1737
1741
|
filesystem_iterator_frame *frame;
|
1738
1742
|
|
1739
|
-
if (i->type !=
|
1743
|
+
if (i->type != GIT_ITERATOR_WORKDIR)
|
1740
1744
|
return false;
|
1741
1745
|
|
1742
1746
|
frame = filesystem_iterator_current_frame(iter);
|
@@ -1748,7 +1752,7 @@ static int filesystem_iterator_advance_over(
|
|
1748
1752
|
git_iterator_status_t *status,
|
1749
1753
|
git_iterator *i)
|
1750
1754
|
{
|
1751
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1755
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1752
1756
|
filesystem_iterator_frame *current_frame;
|
1753
1757
|
filesystem_iterator_entry *current_entry;
|
1754
1758
|
const git_index_entry *entry = NULL;
|
@@ -1867,7 +1871,7 @@ static int filesystem_iterator_init(filesystem_iterator *iter)
|
|
1867
1871
|
|
1868
1872
|
static int filesystem_iterator_reset(git_iterator *i)
|
1869
1873
|
{
|
1870
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1874
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1871
1875
|
|
1872
1876
|
filesystem_iterator_clear(iter);
|
1873
1877
|
return filesystem_iterator_init(iter);
|
@@ -1875,7 +1879,7 @@ static int filesystem_iterator_reset(git_iterator *i)
|
|
1875
1879
|
|
1876
1880
|
static void filesystem_iterator_free(git_iterator *i)
|
1877
1881
|
{
|
1878
|
-
filesystem_iterator *iter = (filesystem_iterator
|
1882
|
+
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1879
1883
|
git__free(iter->root);
|
1880
1884
|
git_buf_dispose(&iter->current_path);
|
1881
1885
|
git_tree_free(iter->tree);
|
@@ -1890,7 +1894,7 @@ static int iterator_for_filesystem(
|
|
1890
1894
|
const char *root,
|
1891
1895
|
git_index *index,
|
1892
1896
|
git_tree *tree,
|
1893
|
-
|
1897
|
+
git_iterator_t type,
|
1894
1898
|
git_iterator_options *options)
|
1895
1899
|
{
|
1896
1900
|
filesystem_iterator *iter;
|
@@ -1967,7 +1971,7 @@ int git_iterator_for_filesystem(
|
|
1967
1971
|
git_iterator_options *options)
|
1968
1972
|
{
|
1969
1973
|
return iterator_for_filesystem(out,
|
1970
|
-
NULL, root, NULL, NULL,
|
1974
|
+
NULL, root, NULL, NULL, GIT_ITERATOR_FS, options);
|
1971
1975
|
}
|
1972
1976
|
|
1973
1977
|
int git_iterator_for_workdir_ext(
|
@@ -1995,7 +1999,7 @@ int git_iterator_for_workdir_ext(
|
|
1995
1999
|
GIT_ITERATOR_IGNORE_DOT_GIT;
|
1996
2000
|
|
1997
2001
|
return iterator_for_filesystem(out,
|
1998
|
-
repo, repo_workdir, index, tree,
|
2002
|
+
repo, repo_workdir, index, tree, GIT_ITERATOR_WORKDIR, &options);
|
1999
2003
|
}
|
2000
2004
|
|
2001
2005
|
|
@@ -2084,7 +2088,7 @@ static int index_iterator_skip_pseudotree(index_iterator *iter)
|
|
2084
2088
|
static int index_iterator_advance(
|
2085
2089
|
const git_index_entry **out, git_iterator *i)
|
2086
2090
|
{
|
2087
|
-
index_iterator *iter = (index_iterator
|
2091
|
+
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2088
2092
|
const git_index_entry *entry = NULL;
|
2089
2093
|
bool is_submodule;
|
2090
2094
|
int error = 0;
|
@@ -2157,7 +2161,7 @@ static int index_iterator_advance(
|
|
2157
2161
|
static int index_iterator_advance_into(
|
2158
2162
|
const git_index_entry **out, git_iterator *i)
|
2159
2163
|
{
|
2160
|
-
index_iterator *iter = (index_iterator
|
2164
|
+
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2161
2165
|
|
2162
2166
|
if (! S_ISDIR(iter->tree_entry.mode)) {
|
2163
2167
|
if (out)
|
@@ -2175,7 +2179,7 @@ static int index_iterator_advance_over(
|
|
2175
2179
|
git_iterator_status_t *status,
|
2176
2180
|
git_iterator *i)
|
2177
2181
|
{
|
2178
|
-
index_iterator *iter = (index_iterator
|
2182
|
+
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2179
2183
|
const git_index_entry *entry;
|
2180
2184
|
int error;
|
2181
2185
|
|
@@ -2204,7 +2208,7 @@ static int index_iterator_init(index_iterator *iter)
|
|
2204
2208
|
|
2205
2209
|
static int index_iterator_reset(git_iterator *i)
|
2206
2210
|
{
|
2207
|
-
index_iterator *iter = (index_iterator
|
2211
|
+
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2208
2212
|
|
2209
2213
|
index_iterator_clear(iter);
|
2210
2214
|
return index_iterator_init(iter);
|
@@ -2212,7 +2216,7 @@ static int index_iterator_reset(git_iterator *i)
|
|
2212
2216
|
|
2213
2217
|
static void index_iterator_free(git_iterator *i)
|
2214
2218
|
{
|
2215
|
-
index_iterator *iter = (index_iterator
|
2219
|
+
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2216
2220
|
|
2217
2221
|
git_index_snapshot_release(&iter->entries, iter->base.index);
|
2218
2222
|
git_buf_dispose(&iter->tree_buf);
|
@@ -2244,7 +2248,7 @@ int git_iterator_for_index(
|
|
2244
2248
|
iter = git__calloc(1, sizeof(index_iterator));
|
2245
2249
|
GIT_ERROR_CHECK_ALLOC(iter);
|
2246
2250
|
|
2247
|
-
iter->base.type =
|
2251
|
+
iter->base.type = GIT_ITERATOR_INDEX;
|
2248
2252
|
iter->base.cb = &callbacks;
|
2249
2253
|
|
2250
2254
|
if ((error = iterator_init_common(&iter->base, repo, index, options)) < 0 ||
|
@@ -17,12 +17,12 @@
|
|
17
17
|
typedef struct git_iterator git_iterator;
|
18
18
|
|
19
19
|
typedef enum {
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
}
|
20
|
+
GIT_ITERATOR_EMPTY = 0,
|
21
|
+
GIT_ITERATOR_TREE = 1,
|
22
|
+
GIT_ITERATOR_INDEX = 2,
|
23
|
+
GIT_ITERATOR_WORKDIR = 3,
|
24
|
+
GIT_ITERATOR_FS = 4,
|
25
|
+
} git_iterator_t;
|
26
26
|
|
27
27
|
typedef enum {
|
28
28
|
/** ignore case for entry sort order */
|
@@ -78,7 +78,7 @@ typedef struct {
|
|
78
78
|
} git_iterator_callbacks;
|
79
79
|
|
80
80
|
struct git_iterator {
|
81
|
-
|
81
|
+
git_iterator_t type;
|
82
82
|
git_iterator_callbacks *cb;
|
83
83
|
|
84
84
|
git_repository *repo;
|
@@ -238,7 +238,7 @@ GIT_INLINE(int) git_iterator_reset(git_iterator *iter)
|
|
238
238
|
extern int git_iterator_reset_range(
|
239
239
|
git_iterator *iter, const char *start, const char *end);
|
240
240
|
|
241
|
-
GIT_INLINE(
|
241
|
+
GIT_INLINE(git_iterator_t) git_iterator_type(git_iterator *iter)
|
242
242
|
{
|
243
243
|
return iter->type;
|
244
244
|
}
|
data/vendor/libgit2/src/map.h
CHANGED
@@ -40,7 +40,7 @@ typedef struct { /* memory mapped buffer */
|
|
40
40
|
assert((prot & GIT_PROT_WRITE) || (prot & GIT_PROT_READ)); \
|
41
41
|
assert((flags & GIT_MAP_FIXED) == 0); } while (0)
|
42
42
|
|
43
|
-
extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd,
|
43
|
+
extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset);
|
44
44
|
extern int p_munmap(git_map *map);
|
45
45
|
|
46
46
|
#endif
|
data/vendor/libgit2/src/merge.c
CHANGED
@@ -68,9 +68,19 @@ struct merge_diff_df_data {
|
|
68
68
|
git_merge_diff *prev_conflict;
|
69
69
|
};
|
70
70
|
|
71
|
+
/*
|
72
|
+
* This acts as a negative cache entry marker. In case we've tried to calculate
|
73
|
+
* similarity metrics for a given blob already but `git_hashsig` determined
|
74
|
+
* that it's too small in order to have a meaningful hash signature, we will
|
75
|
+
* insert the address of this marker instead of `NULL`. Like this, we can
|
76
|
+
* easily check whether we have checked a gien entry already and skip doing the
|
77
|
+
* calculation again and again.
|
78
|
+
*/
|
79
|
+
static int cache_invalid_marker;
|
80
|
+
|
71
81
|
/* Merge base computation */
|
72
82
|
|
73
|
-
int merge_bases_many(git_commit_list **out, git_revwalk **walk_out, git_repository *repo, size_t length, const git_oid input_array[])
|
83
|
+
static int merge_bases_many(git_commit_list **out, git_revwalk **walk_out, git_repository *repo, size_t length, const git_oid input_array[])
|
74
84
|
{
|
75
85
|
git_revwalk *walk = NULL;
|
76
86
|
git_vector list;
|
@@ -310,46 +320,55 @@ static int interesting(git_pqueue *list)
|
|
310
320
|
return 0;
|
311
321
|
}
|
312
322
|
|
313
|
-
static
|
323
|
+
static int clear_commit_marks_1(git_commit_list **plist,
|
314
324
|
git_commit_list_node *commit, unsigned int mark)
|
315
325
|
{
|
316
326
|
while (commit) {
|
317
327
|
unsigned int i;
|
318
328
|
|
319
329
|
if (!(mark & commit->flags))
|
320
|
-
return;
|
330
|
+
return 0;
|
321
331
|
|
322
332
|
commit->flags &= ~mark;
|
323
333
|
|
324
334
|
for (i = 1; i < commit->out_degree; i++) {
|
325
335
|
git_commit_list_node *p = commit->parents[i];
|
326
|
-
git_commit_list_insert(p, plist)
|
336
|
+
if (git_commit_list_insert(p, plist) == NULL)
|
337
|
+
return -1;
|
327
338
|
}
|
328
339
|
|
329
340
|
commit = commit->out_degree ? commit->parents[0] : NULL;
|
330
341
|
}
|
342
|
+
|
343
|
+
return 0;
|
331
344
|
}
|
332
345
|
|
333
|
-
static
|
346
|
+
static int clear_commit_marks_many(git_vector *commits, unsigned int mark)
|
334
347
|
{
|
335
348
|
git_commit_list *list = NULL;
|
336
349
|
git_commit_list_node *c;
|
337
350
|
unsigned int i;
|
338
351
|
|
339
352
|
git_vector_foreach(commits, i, c) {
|
340
|
-
git_commit_list_insert(c, &list)
|
353
|
+
if (git_commit_list_insert(c, &list) == NULL)
|
354
|
+
return -1;
|
341
355
|
}
|
342
356
|
|
343
357
|
while (list)
|
344
|
-
clear_commit_marks_1(&list, git_commit_list_pop(&list), mark)
|
358
|
+
if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
|
359
|
+
return -1;
|
360
|
+
return 0;
|
345
361
|
}
|
346
362
|
|
347
|
-
static
|
363
|
+
static int clear_commit_marks(git_commit_list_node *commit, unsigned int mark)
|
348
364
|
{
|
349
365
|
git_commit_list *list = NULL;
|
350
|
-
git_commit_list_insert(commit, &list)
|
366
|
+
if (git_commit_list_insert(commit, &list) == NULL)
|
367
|
+
return -1;
|
351
368
|
while (list)
|
352
|
-
clear_commit_marks_1(&list, git_commit_list_pop(&list), mark)
|
369
|
+
if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
|
370
|
+
return -1;
|
371
|
+
return 0;
|
353
372
|
}
|
354
373
|
|
355
374
|
static int paint_down_to_common(
|
@@ -466,10 +485,11 @@ static int remove_redundant(git_revwalk *walk, git_vector *commits)
|
|
466
485
|
redundant[filled_index[j]] = 1;
|
467
486
|
}
|
468
487
|
|
469
|
-
clear_commit_marks(commit, ALL_FLAGS);
|
470
|
-
clear_commit_marks_many(&work, ALL_FLAGS);
|
471
|
-
|
472
488
|
git_commit_list_free(&common);
|
489
|
+
|
490
|
+
if ((error = clear_commit_marks(commit, ALL_FLAGS)) < 0 ||
|
491
|
+
(error = clear_commit_marks_many(&work, ALL_FLAGS)) < 0)
|
492
|
+
goto done;
|
473
493
|
}
|
474
494
|
|
475
495
|
for (i = 0; i < commits->length; ++i) {
|
@@ -531,10 +551,9 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l
|
|
531
551
|
while (result)
|
532
552
|
git_vector_insert(&redundant, git_commit_list_pop(&result));
|
533
553
|
|
534
|
-
clear_commit_marks(one, ALL_FLAGS)
|
535
|
-
|
536
|
-
|
537
|
-
if ((error = remove_redundant(walk, &redundant)) < 0) {
|
554
|
+
if ((error = clear_commit_marks(one, ALL_FLAGS)) < 0 ||
|
555
|
+
(error = clear_commit_marks_many(twos, ALL_FLAGS)) < 0 ||
|
556
|
+
(error = remove_redundant(walk, &redundant)) < 0) {
|
538
557
|
git_vector_free(&redundant);
|
539
558
|
return error;
|
540
559
|
}
|
@@ -867,7 +886,7 @@ static int merge_conflict_invoke_driver(
|
|
867
886
|
|
868
887
|
git_oid_cpy(&result->id, &oid);
|
869
888
|
result->mode = mode;
|
870
|
-
result->file_size = buf.size;
|
889
|
+
result->file_size = (uint32_t)buf.size;
|
871
890
|
|
872
891
|
result->path = git_pool_strdup(&diff_list->pool, path);
|
873
892
|
GIT_ERROR_CHECK_ALLOC(result->path);
|
@@ -1015,9 +1034,12 @@ static int index_entry_similarity_calc(
|
|
1015
1034
|
{
|
1016
1035
|
git_blob *blob;
|
1017
1036
|
git_diff_file diff_file = {{{0}}};
|
1018
|
-
|
1037
|
+
git_object_size_t blobsize;
|
1019
1038
|
int error;
|
1020
1039
|
|
1040
|
+
if (*out || *out == &cache_invalid_marker)
|
1041
|
+
return 0;
|
1042
|
+
|
1021
1043
|
*out = NULL;
|
1022
1044
|
|
1023
1045
|
if ((error = git_blob_lookup(&blob, repo, &entry->id)) < 0)
|
@@ -1038,6 +1060,8 @@ static int index_entry_similarity_calc(
|
|
1038
1060
|
error = opts->metric->buffer_signature(out, &diff_file,
|
1039
1061
|
git_blob_rawcontent(blob), (size_t)blobsize,
|
1040
1062
|
opts->metric->payload);
|
1063
|
+
if (error == GIT_EBUFS)
|
1064
|
+
*out = &cache_invalid_marker;
|
1041
1065
|
|
1042
1066
|
git_blob_free(blob);
|
1043
1067
|
|
@@ -1060,18 +1084,16 @@ static int index_entry_similarity_inexact(
|
|
1060
1084
|
return 0;
|
1061
1085
|
|
1062
1086
|
/* update signature cache if needed */
|
1063
|
-
if (
|
1064
|
-
|
1065
|
-
if (!cache[b_idx] && (error = index_entry_similarity_calc(&cache[b_idx], repo, b, opts)) < 0)
|
1087
|
+
if ((error = index_entry_similarity_calc(&cache[a_idx], repo, a, opts)) < 0 ||
|
1088
|
+
(error = index_entry_similarity_calc(&cache[b_idx], repo, b, opts)) < 0)
|
1066
1089
|
return error;
|
1067
1090
|
|
1068
1091
|
/* some metrics may not wish to process this file (too big / too small) */
|
1069
|
-
if (
|
1092
|
+
if (cache[a_idx] == &cache_invalid_marker || cache[b_idx] == &cache_invalid_marker)
|
1070
1093
|
return 0;
|
1071
1094
|
|
1072
1095
|
/* compare signatures */
|
1073
|
-
if (opts->metric->similarity(
|
1074
|
-
&score, cache[a_idx], cache[b_idx], opts->metric->payload) < 0)
|
1096
|
+
if (opts->metric->similarity(&score, cache[a_idx], cache[b_idx], opts->metric->payload) < 0)
|
1075
1097
|
return -1;
|
1076
1098
|
|
1077
1099
|
/* clip score */
|
@@ -1104,14 +1126,12 @@ static void deletes_by_oid_free(git_oidmap *map) {
|
|
1104
1126
|
git_oidmap_free(map);
|
1105
1127
|
}
|
1106
1128
|
|
1107
|
-
static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid *id, size_t idx)
|
1108
|
-
|
1129
|
+
static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid *id, size_t idx)
|
1130
|
+
{
|
1109
1131
|
deletes_by_oid_queue *queue;
|
1110
1132
|
size_t *array_entry;
|
1111
|
-
int error;
|
1112
1133
|
|
1113
|
-
|
1114
|
-
if (!git_oidmap_valid_index(map, pos)) {
|
1134
|
+
if ((queue = git_oidmap_get(map, id)) == NULL) {
|
1115
1135
|
queue = git_pool_malloc(pool, sizeof(deletes_by_oid_queue));
|
1116
1136
|
GIT_ERROR_CHECK_ALLOC(queue);
|
1117
1137
|
|
@@ -1119,11 +1139,9 @@ static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid
|
|
1119
1139
|
queue->next_pos = 0;
|
1120
1140
|
queue->first_entry = idx;
|
1121
1141
|
|
1122
|
-
|
1123
|
-
if (error < 0)
|
1142
|
+
if (git_oidmap_set(map, id, queue) < 0)
|
1124
1143
|
return -1;
|
1125
1144
|
} else {
|
1126
|
-
queue = git_oidmap_value_at(map, pos);
|
1127
1145
|
array_entry = git_array_alloc(queue->arr);
|
1128
1146
|
GIT_ERROR_CHECK_ALLOC(array_entry);
|
1129
1147
|
*array_entry = idx;
|
@@ -1132,18 +1150,14 @@ static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid
|
|
1132
1150
|
return 0;
|
1133
1151
|
}
|
1134
1152
|
|
1135
|
-
static int deletes_by_oid_dequeue(size_t *idx, git_oidmap *map, const git_oid *id)
|
1136
|
-
|
1153
|
+
static int deletes_by_oid_dequeue(size_t *idx, git_oidmap *map, const git_oid *id)
|
1154
|
+
{
|
1137
1155
|
deletes_by_oid_queue *queue;
|
1138
1156
|
size_t *array_entry;
|
1139
1157
|
|
1140
|
-
|
1141
|
-
|
1142
|
-
if (!git_oidmap_valid_index(map, pos))
|
1158
|
+
if ((queue = git_oidmap_get(map, id)) == NULL)
|
1143
1159
|
return GIT_ENOTFOUND;
|
1144
1160
|
|
1145
|
-
queue = git_oidmap_value_at(map, pos);
|
1146
|
-
|
1147
1161
|
if (queue->next_pos == 0) {
|
1148
1162
|
*idx = queue->first_entry;
|
1149
1163
|
} else {
|
@@ -1168,8 +1182,8 @@ static int merge_diff_mark_similarity_exact(
|
|
1168
1182
|
git_oidmap *ours_deletes_by_oid = NULL, *theirs_deletes_by_oid = NULL;
|
1169
1183
|
int error = 0;
|
1170
1184
|
|
1171
|
-
if (
|
1172
|
-
|
1185
|
+
if (git_oidmap_new(&ours_deletes_by_oid) < 0 ||
|
1186
|
+
git_oidmap_new(&theirs_deletes_by_oid) < 0) {
|
1173
1187
|
error = -1;
|
1174
1188
|
goto done;
|
1175
1189
|
}
|
@@ -1549,7 +1563,7 @@ int git_merge_diff_list__find_renames(
|
|
1549
1563
|
done:
|
1550
1564
|
if (cache != NULL) {
|
1551
1565
|
for (i = 0; i < cache_size; ++i) {
|
1552
|
-
if (cache[i] != NULL)
|
1566
|
+
if (cache[i] != NULL && cache[i] != &cache_invalid_marker)
|
1553
1567
|
opts->metric->free_signature(cache[i], opts->metric->payload);
|
1554
1568
|
}
|
1555
1569
|
|
@@ -1796,12 +1810,12 @@ git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo)
|
|
1796
1810
|
|
1797
1811
|
diff_list->repo = repo;
|
1798
1812
|
|
1799
|
-
git_pool_init(&diff_list->pool, 1);
|
1800
1813
|
|
1801
|
-
if (
|
1802
|
-
|
1803
|
-
|
1804
|
-
|
1814
|
+
if (git_pool_init(&diff_list->pool, 1) < 0 ||
|
1815
|
+
git_vector_init(&diff_list->staged, 0, NULL) < 0 ||
|
1816
|
+
git_vector_init(&diff_list->conflicts, 0, NULL) < 0 ||
|
1817
|
+
git_vector_init(&diff_list->resolved, 0, NULL) < 0) {
|
1818
|
+
git_merge_diff_list__free(diff_list);
|
1805
1819
|
return NULL;
|
1806
1820
|
}
|
1807
1821
|
|
@@ -2244,8 +2258,11 @@ static int create_virtual_base(
|
|
2244
2258
|
result->type = GIT_ANNOTATED_COMMIT_VIRTUAL;
|
2245
2259
|
result->index = index;
|
2246
2260
|
|
2247
|
-
insert_head_ids(&result->parents, one)
|
2248
|
-
|
2261
|
+
if (insert_head_ids(&result->parents, one) < 0 ||
|
2262
|
+
insert_head_ids(&result->parents, two) < 0) {
|
2263
|
+
git_annotated_commit_free(result);
|
2264
|
+
return -1;
|
2265
|
+
}
|
2249
2266
|
|
2250
2267
|
*out = result;
|
2251
2268
|
return 0;
|
@@ -2831,7 +2848,7 @@ on_error:
|
|
2831
2848
|
return error;
|
2832
2849
|
}
|
2833
2850
|
|
2834
|
-
const char *merge_their_label(const char *branchname)
|
2851
|
+
static const char *merge_their_label(const char *branchname)
|
2835
2852
|
{
|
2836
2853
|
const char *slash;
|
2837
2854
|
|
@@ -3120,9 +3137,6 @@ static int merge_heads(
|
|
3120
3137
|
*ancestor_head_out = NULL;
|
3121
3138
|
*our_head_out = NULL;
|
3122
3139
|
|
3123
|
-
if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0)
|
3124
|
-
goto done;
|
3125
|
-
|
3126
3140
|
if ((error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0)
|
3127
3141
|
goto done;
|
3128
3142
|
|
@@ -3333,24 +3347,46 @@ done:
|
|
3333
3347
|
return error;
|
3334
3348
|
}
|
3335
3349
|
|
3336
|
-
int
|
3350
|
+
int git_merge_options_init(git_merge_options *opts, unsigned int version)
|
3337
3351
|
{
|
3338
3352
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
3339
3353
|
opts, version, git_merge_options, GIT_MERGE_OPTIONS_INIT);
|
3340
3354
|
return 0;
|
3341
3355
|
}
|
3342
3356
|
|
3343
|
-
|
3357
|
+
#ifndef GIT_DEPRECATE_HARD
|
3358
|
+
int git_merge_init_options(git_merge_options *opts, unsigned int version)
|
3359
|
+
{
|
3360
|
+
return git_merge_options_init(opts, version);
|
3361
|
+
}
|
3362
|
+
#endif
|
3363
|
+
|
3364
|
+
int git_merge_file_input_init(git_merge_file_input *input, unsigned int version)
|
3344
3365
|
{
|
3345
3366
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
3346
3367
|
input, version, git_merge_file_input, GIT_MERGE_FILE_INPUT_INIT);
|
3347
3368
|
return 0;
|
3348
3369
|
}
|
3349
3370
|
|
3350
|
-
|
3371
|
+
#ifndef GIT_DEPRECATE_HARD
|
3372
|
+
int git_merge_file_init_input(git_merge_file_input *input, unsigned int version)
|
3373
|
+
{
|
3374
|
+
return git_merge_file_input_init(input, version);
|
3375
|
+
}
|
3376
|
+
#endif
|
3377
|
+
|
3378
|
+
int git_merge_file_options_init(
|
3351
3379
|
git_merge_file_options *opts, unsigned int version)
|
3352
3380
|
{
|
3353
3381
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
3354
3382
|
opts, version, git_merge_file_options, GIT_MERGE_FILE_OPTIONS_INIT);
|
3355
3383
|
return 0;
|
3356
3384
|
}
|
3385
|
+
|
3386
|
+
#ifndef GIT_DEPRECATE_HARD
|
3387
|
+
int git_merge_file_init_options(
|
3388
|
+
git_merge_file_options *opts, unsigned int version)
|
3389
|
+
{
|
3390
|
+
return git_merge_file_options_init(opts, version);
|
3391
|
+
}
|
3392
|
+
#endif
|