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
@@ -14,7 +14,7 @@
|
|
14
14
|
#include "vector.h"
|
15
15
|
#include "pool.h"
|
16
16
|
#include "buffer.h"
|
17
|
-
#include "
|
17
|
+
#include "futils.h"
|
18
18
|
|
19
19
|
#define GIT_ATTR_FILE ".gitattributes"
|
20
20
|
#define GIT_ATTR_FILE_INREPO "attributes"
|
@@ -32,19 +32,17 @@
|
|
32
32
|
#define GIT_ATTR_FNMATCH_MATCH_ALL (1U << 8)
|
33
33
|
#define GIT_ATTR_FNMATCH_ALLOWNEG (1U << 9)
|
34
34
|
#define GIT_ATTR_FNMATCH_ALLOWMACRO (1U << 10)
|
35
|
-
#define GIT_ATTR_FNMATCH_LEADINGDIR (1U << 11)
|
36
|
-
#define GIT_ATTR_FNMATCH_NOLEADINGDIR (1U << 12)
|
37
35
|
|
38
36
|
#define GIT_ATTR_FNMATCH__INCOMING \
|
39
|
-
(GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG |
|
40
|
-
GIT_ATTR_FNMATCH_ALLOWMACRO | GIT_ATTR_FNMATCH_NOLEADINGDIR)
|
37
|
+
(GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG | GIT_ATTR_FNMATCH_ALLOWMACRO)
|
41
38
|
|
42
39
|
typedef enum {
|
43
40
|
GIT_ATTR_FILE__IN_MEMORY = 0,
|
44
41
|
GIT_ATTR_FILE__FROM_FILE = 1,
|
45
42
|
GIT_ATTR_FILE__FROM_INDEX = 2,
|
43
|
+
GIT_ATTR_FILE__FROM_HEAD = 3,
|
46
44
|
|
47
|
-
GIT_ATTR_FILE_NUM_SOURCES =
|
45
|
+
GIT_ATTR_FILE_NUM_SOURCES = 4
|
48
46
|
} git_attr_file_source;
|
49
47
|
|
50
48
|
extern const char *git_attr__true;
|
@@ -134,7 +132,8 @@ extern int git_attr_get_many_with_session(
|
|
134
132
|
typedef int (*git_attr_file_parser)(
|
135
133
|
git_repository *repo,
|
136
134
|
git_attr_file *file,
|
137
|
-
const char *data
|
135
|
+
const char *data,
|
136
|
+
bool allow_macros);
|
138
137
|
|
139
138
|
/*
|
140
139
|
* git_attr_file API
|
@@ -153,7 +152,8 @@ int git_attr_file__load(
|
|
153
152
|
git_attr_session *attr_session,
|
154
153
|
git_attr_file_entry *ce,
|
155
154
|
git_attr_file_source source,
|
156
|
-
git_attr_file_parser parser
|
155
|
+
git_attr_file_parser parser,
|
156
|
+
bool allow_macros);
|
157
157
|
|
158
158
|
int git_attr_file__load_standalone(
|
159
159
|
git_attr_file **out, const char *path);
|
@@ -162,7 +162,7 @@ int git_attr_file__out_of_date(
|
|
162
162
|
git_repository *repo, git_attr_session *session, git_attr_file *file);
|
163
163
|
|
164
164
|
int git_attr_file__parse_buffer(
|
165
|
-
git_repository *repo, git_attr_file *attrs, const char *data);
|
165
|
+
git_repository *repo, git_attr_file *attrs, const char *data, bool allow_macros);
|
166
166
|
|
167
167
|
int git_attr_file__clear_rules(
|
168
168
|
git_attr_file *file, bool need_lock);
|
@@ -33,12 +33,7 @@ GIT_INLINE(void) attr_cache_unlock(git_attr_cache *cache)
|
|
33
33
|
GIT_INLINE(git_attr_file_entry *) attr_cache_lookup_entry(
|
34
34
|
git_attr_cache *cache, const char *path)
|
35
35
|
{
|
36
|
-
|
37
|
-
|
38
|
-
if (git_strmap_valid_index(cache->files, pos))
|
39
|
-
return git_strmap_value_at(cache->files, pos);
|
40
|
-
else
|
41
|
-
return NULL;
|
36
|
+
return git_strmap_get(cache->files, path);
|
42
37
|
}
|
43
38
|
|
44
39
|
int git_attr_cache__alloc_file_entry(
|
@@ -59,7 +54,7 @@ int git_attr_cache__alloc_file_entry(
|
|
59
54
|
cachesize++;
|
60
55
|
}
|
61
56
|
|
62
|
-
ce = git_pool_mallocz(pool,
|
57
|
+
ce = git_pool_mallocz(pool, cachesize);
|
63
58
|
GIT_ERROR_CHECK_ALLOC(ce);
|
64
59
|
|
65
60
|
if (baselen) {
|
@@ -80,18 +75,16 @@ int git_attr_cache__alloc_file_entry(
|
|
80
75
|
static int attr_cache_make_entry(
|
81
76
|
git_attr_file_entry **out, git_repository *repo, const char *path)
|
82
77
|
{
|
83
|
-
int error = 0;
|
84
78
|
git_attr_cache *cache = git_repository_attr_cache(repo);
|
85
79
|
git_attr_file_entry *entry = NULL;
|
80
|
+
int error;
|
86
81
|
|
87
|
-
error = git_attr_cache__alloc_file_entry(
|
88
|
-
|
82
|
+
if ((error = git_attr_cache__alloc_file_entry(&entry, git_repository_workdir(repo),
|
83
|
+
path, &cache->pool)) < 0)
|
84
|
+
return error;
|
89
85
|
|
90
|
-
if (
|
91
|
-
|
92
|
-
if (error > 0)
|
93
|
-
error = 0;
|
94
|
-
}
|
86
|
+
if ((error = git_strmap_set(cache->files, entry->path, entry)) < 0)
|
87
|
+
return error;
|
95
88
|
|
96
89
|
*out = entry;
|
97
90
|
return error;
|
@@ -215,7 +208,8 @@ int git_attr_cache__get(
|
|
215
208
|
git_attr_file_source source,
|
216
209
|
const char *base,
|
217
210
|
const char *filename,
|
218
|
-
git_attr_file_parser parser
|
211
|
+
git_attr_file_parser parser,
|
212
|
+
bool allow_macros)
|
219
213
|
{
|
220
214
|
int error = 0;
|
221
215
|
git_attr_cache *cache = git_repository_attr_cache(repo);
|
@@ -228,7 +222,7 @@ int git_attr_cache__get(
|
|
228
222
|
|
229
223
|
/* load file if we don't have one or if existing one is out of date */
|
230
224
|
if (!file || (error = git_attr_file__out_of_date(repo, attr_session, file)) > 0)
|
231
|
-
error = git_attr_file__load(&updated, repo, attr_session, entry, source, parser);
|
225
|
+
error = git_attr_file__load(&updated, repo, attr_session, entry, source, parser, allow_macros);
|
232
226
|
|
233
227
|
/* if we loaded the file, insert into and/or update cache */
|
234
228
|
if (updated) {
|
@@ -265,19 +259,15 @@ bool git_attr_cache__is_cached(
|
|
265
259
|
const char *filename)
|
266
260
|
{
|
267
261
|
git_attr_cache *cache = git_repository_attr_cache(repo);
|
268
|
-
git_strmap *files;
|
269
|
-
size_t pos;
|
270
262
|
git_attr_file_entry *entry;
|
263
|
+
git_strmap *files;
|
271
264
|
|
272
265
|
if (!cache || !(files = cache->files))
|
273
266
|
return false;
|
274
267
|
|
275
|
-
|
276
|
-
if (!git_strmap_valid_index(files, pos))
|
268
|
+
if ((entry = git_strmap_get(files, filename)) == NULL)
|
277
269
|
return false;
|
278
270
|
|
279
|
-
entry = git_strmap_value_at(files, pos);
|
280
|
-
|
281
271
|
return entry && (entry->file[source] != NULL);
|
282
272
|
}
|
283
273
|
|
@@ -400,12 +390,11 @@ int git_attr_cache__init(git_repository *repo)
|
|
400
390
|
/* allocate hashtable for attribute and ignore file contents,
|
401
391
|
* hashtable for attribute macros, and string pool
|
402
392
|
*/
|
403
|
-
if ((ret =
|
404
|
-
|
393
|
+
if ((ret = git_strmap_new(&cache->files)) < 0 ||
|
394
|
+
(ret = git_strmap_new(&cache->macros)) < 0 ||
|
395
|
+
(ret = git_pool_init(&cache->pool, 1)) < 0)
|
405
396
|
goto cancel;
|
406
397
|
|
407
|
-
git_pool_init(&cache->pool, 1);
|
408
|
-
|
409
398
|
cache = git__compare_and_swap(&repo->attrcache, NULL, cache);
|
410
399
|
if (cache)
|
411
400
|
goto cancel; /* raced with another thread, free this but no error */
|
@@ -421,7 +410,7 @@ cancel:
|
|
421
410
|
return ret;
|
422
411
|
}
|
423
412
|
|
424
|
-
|
413
|
+
int git_attr_cache_flush(git_repository *repo)
|
425
414
|
{
|
426
415
|
git_attr_cache *cache;
|
427
416
|
|
@@ -430,40 +419,50 @@ void git_attr_cache_flush(git_repository *repo)
|
|
430
419
|
*/
|
431
420
|
if (repo && (cache = git__swap(repo->attrcache, NULL)) != NULL)
|
432
421
|
attr_cache__free(cache);
|
422
|
+
|
423
|
+
return 0;
|
433
424
|
}
|
434
425
|
|
435
426
|
int git_attr_cache__insert_macro(git_repository *repo, git_attr_rule *macro)
|
436
427
|
{
|
437
428
|
git_attr_cache *cache = git_repository_attr_cache(repo);
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
/* TODO: generate warning log if (macro->assigns.length == 0) */
|
442
|
-
if (macro->assigns.length == 0)
|
443
|
-
return 0;
|
429
|
+
git_attr_rule *preexisting;
|
430
|
+
bool locked = false;
|
431
|
+
int error = 0;
|
444
432
|
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
433
|
+
/*
|
434
|
+
* Callers assume that if we return success, that the
|
435
|
+
* macro will have been adopted by the attributes cache.
|
436
|
+
* Thus, we have to free the macro here if it's not being
|
437
|
+
* added to the cache.
|
438
|
+
*
|
439
|
+
* TODO: generate warning log if (macro->assigns.length == 0)
|
440
|
+
*/
|
441
|
+
if (macro->assigns.length == 0) {
|
442
|
+
git_attr_rule__free(macro);
|
443
|
+
goto out;
|
451
444
|
}
|
452
445
|
|
453
|
-
|
446
|
+
if ((error = attr_cache_lock(cache)) < 0)
|
447
|
+
goto out;
|
448
|
+
locked = true;
|
449
|
+
|
450
|
+
if ((preexisting = git_strmap_get(cache->macros, macro->match.pattern)) != NULL)
|
451
|
+
git_attr_rule__free(preexisting);
|
452
|
+
|
453
|
+
if ((error = git_strmap_set(cache->macros, macro->match.pattern, macro)) < 0)
|
454
|
+
goto out;
|
455
|
+
|
456
|
+
out:
|
457
|
+
if (locked)
|
458
|
+
attr_cache_unlock(cache);
|
459
|
+
return error;
|
454
460
|
}
|
455
461
|
|
456
462
|
git_attr_rule *git_attr_cache__lookup_macro(
|
457
463
|
git_repository *repo, const char *name)
|
458
464
|
{
|
459
465
|
git_strmap *macros = git_repository_attr_cache(repo)->macros;
|
460
|
-
size_t pos;
|
461
466
|
|
462
|
-
|
463
|
-
|
464
|
-
if (!git_strmap_valid_index(macros, pos))
|
465
|
-
return NULL;
|
466
|
-
|
467
|
-
return (git_attr_rule *)git_strmap_value_at(macros, pos);
|
467
|
+
return git_strmap_get(macros, name);
|
468
468
|
}
|
469
|
-
|
@@ -34,7 +34,8 @@ extern int git_attr_cache__get(
|
|
34
34
|
git_attr_file_source source,
|
35
35
|
const char *base,
|
36
36
|
const char *filename,
|
37
|
-
git_attr_file_parser parser
|
37
|
+
git_attr_file_parser parser,
|
38
|
+
bool allow_macros);
|
38
39
|
|
39
40
|
extern bool git_attr_cache__is_cached(
|
40
41
|
git_repository *repo,
|
data/vendor/libgit2/src/blame.c
CHANGED
@@ -76,6 +76,14 @@ static git_blame_hunk* new_hunk(
|
|
76
76
|
return hunk;
|
77
77
|
}
|
78
78
|
|
79
|
+
static void free_hunk(git_blame_hunk *hunk)
|
80
|
+
{
|
81
|
+
git__free((void*)hunk->orig_path);
|
82
|
+
git_signature_free(hunk->final_signature);
|
83
|
+
git_signature_free(hunk->orig_signature);
|
84
|
+
git__free(hunk);
|
85
|
+
}
|
86
|
+
|
79
87
|
static git_blame_hunk* dup_hunk(git_blame_hunk *hunk)
|
80
88
|
{
|
81
89
|
git_blame_hunk *newhunk = new_hunk(
|
@@ -90,17 +98,14 @@ static git_blame_hunk* dup_hunk(git_blame_hunk *hunk)
|
|
90
98
|
git_oid_cpy(&newhunk->orig_commit_id, &hunk->orig_commit_id);
|
91
99
|
git_oid_cpy(&newhunk->final_commit_id, &hunk->final_commit_id);
|
92
100
|
newhunk->boundary = hunk->boundary;
|
93
|
-
git_signature_dup(&newhunk->final_signature, hunk->final_signature);
|
94
|
-
git_signature_dup(&newhunk->orig_signature, hunk->orig_signature);
|
95
|
-
return newhunk;
|
96
|
-
}
|
97
101
|
|
98
|
-
|
99
|
-
{
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
102
|
+
if (git_signature_dup(&newhunk->final_signature, hunk->final_signature) < 0 ||
|
103
|
+
git_signature_dup(&newhunk->orig_signature, hunk->orig_signature) < 0) {
|
104
|
+
free_hunk(newhunk);
|
105
|
+
return NULL;
|
106
|
+
}
|
107
|
+
|
108
|
+
return newhunk;
|
104
109
|
}
|
105
110
|
|
106
111
|
/* Starting with the hunk that includes start_line, shift all following hunks'
|
@@ -204,7 +209,7 @@ static int normalize_options(
|
|
204
209
|
memcpy(out, in, sizeof(git_blame_options));
|
205
210
|
|
206
211
|
/* No newest_commit => HEAD */
|
207
|
-
if (
|
212
|
+
if (git_oid_is_zero(&out->newest_commit)) {
|
208
213
|
if (git_reference_name_to_id(&out->newest_commit, repo, "HEAD") < 0) {
|
209
214
|
return -1;
|
210
215
|
}
|
@@ -268,7 +273,7 @@ static git_blame_hunk *split_hunk_in_vector(
|
|
268
273
|
static int index_blob_lines(git_blame *blame)
|
269
274
|
{
|
270
275
|
const char *buf = blame->final_buf;
|
271
|
-
|
276
|
+
size_t len = blame->final_buf_size;
|
272
277
|
int num = 0, incomplete = 0, bol = 1;
|
273
278
|
size_t *i;
|
274
279
|
|
@@ -335,8 +340,15 @@ static int blame_internal(git_blame *blame)
|
|
335
340
|
if ((error = load_blob(blame)) < 0 ||
|
336
341
|
(error = git_blame__get_origin(&o, blame, blame->final, blame->path)) < 0)
|
337
342
|
goto cleanup;
|
343
|
+
|
344
|
+
if (git_blob_rawsize(blame->final_blob) > SIZE_MAX) {
|
345
|
+
git_error_set(GIT_ERROR_NOMEMORY, "blob is too large to blame");
|
346
|
+
error = -1;
|
347
|
+
goto cleanup;
|
348
|
+
}
|
349
|
+
|
338
350
|
blame->final_buf = git_blob_rawcontent(blame->final_blob);
|
339
|
-
blame->final_buf_size = git_blob_rawsize(blame->final_blob);
|
351
|
+
blame->final_buf_size = (size_t)git_blob_rawsize(blame->final_blob);
|
340
352
|
|
341
353
|
ent = git__calloc(1, sizeof(git_blame__entry));
|
342
354
|
GIT_ERROR_CHECK_ALLOC(ent);
|
@@ -408,7 +420,7 @@ on_error:
|
|
408
420
|
|
409
421
|
static bool hunk_is_bufferblame(git_blame_hunk *hunk)
|
410
422
|
{
|
411
|
-
return hunk &&
|
423
|
+
return hunk && git_oid_is_zero(&hunk->final_commit_id);
|
412
424
|
}
|
413
425
|
|
414
426
|
static int buffer_hunk_cb(
|
@@ -524,9 +536,16 @@ int git_blame_buffer(
|
|
524
536
|
return 0;
|
525
537
|
}
|
526
538
|
|
527
|
-
int
|
539
|
+
int git_blame_options_init(git_blame_options *opts, unsigned int version)
|
528
540
|
{
|
529
541
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
530
542
|
opts, version, git_blame_options, GIT_BLAME_OPTIONS_INIT);
|
531
543
|
return 0;
|
532
544
|
}
|
545
|
+
|
546
|
+
#ifndef GIT_DEPRECATE_HARD
|
547
|
+
int git_blame_init_options(git_blame_options *opts, unsigned int version)
|
548
|
+
{
|
549
|
+
return git_blame_options_init(opts, version);
|
550
|
+
}
|
551
|
+
#endif
|
data/vendor/libgit2/src/blame.h
CHANGED
@@ -219,7 +219,7 @@ static void dup_entry(git_blame__entry *dst, git_blame__entry *src)
|
|
219
219
|
* split_overlap() divided an existing blame e into up to three parts in split.
|
220
220
|
* Adjust the linked list of blames in the scoreboard to reflect the split.
|
221
221
|
*/
|
222
|
-
static
|
222
|
+
static int split_blame(git_blame *blame, git_blame__entry *split, git_blame__entry *e)
|
223
223
|
{
|
224
224
|
git_blame__entry *new_entry;
|
225
225
|
|
@@ -229,11 +229,13 @@ static void split_blame(git_blame *blame, git_blame__entry *split, git_blame__en
|
|
229
229
|
|
230
230
|
/* The last part -- me */
|
231
231
|
new_entry = git__malloc(sizeof(*new_entry));
|
232
|
+
GIT_ERROR_CHECK_ALLOC(new_entry);
|
232
233
|
memcpy(new_entry, &(split[2]), sizeof(git_blame__entry));
|
233
234
|
add_blame_entry(blame, new_entry);
|
234
235
|
|
235
236
|
/* ... and the middle part -- parent */
|
236
237
|
new_entry = git__malloc(sizeof(*new_entry));
|
238
|
+
GIT_ERROR_CHECK_ALLOC(new_entry);
|
237
239
|
memcpy(new_entry, &(split[1]), sizeof(git_blame__entry));
|
238
240
|
add_blame_entry(blame, new_entry);
|
239
241
|
} else if (!split[0].suspect && !split[2].suspect) {
|
@@ -246,15 +248,19 @@ static void split_blame(git_blame *blame, git_blame__entry *split, git_blame__en
|
|
246
248
|
/* me and then parent */
|
247
249
|
dup_entry(e, &split[0]);
|
248
250
|
new_entry = git__malloc(sizeof(*new_entry));
|
251
|
+
GIT_ERROR_CHECK_ALLOC(new_entry);
|
249
252
|
memcpy(new_entry, &(split[1]), sizeof(git_blame__entry));
|
250
253
|
add_blame_entry(blame, new_entry);
|
251
254
|
} else {
|
252
255
|
/* parent and then me */
|
253
256
|
dup_entry(e, &split[1]);
|
254
257
|
new_entry = git__malloc(sizeof(*new_entry));
|
258
|
+
GIT_ERROR_CHECK_ALLOC(new_entry);
|
255
259
|
memcpy(new_entry, &(split[2]), sizeof(git_blame__entry));
|
256
260
|
add_blame_entry(blame, new_entry);
|
257
261
|
}
|
262
|
+
|
263
|
+
return 0;
|
258
264
|
}
|
259
265
|
|
260
266
|
/*
|
@@ -272,7 +278,7 @@ static void decref_split(git_blame__entry *split)
|
|
272
278
|
* Helper for blame_chunk(). blame_entry e is known to overlap with the patch
|
273
279
|
* hunk; split it and pass blame to the parent.
|
274
280
|
*/
|
275
|
-
static
|
281
|
+
static int blame_overlap(
|
276
282
|
git_blame *blame,
|
277
283
|
git_blame__entry *e,
|
278
284
|
size_t tlno,
|
@@ -284,8 +290,11 @@ static void blame_overlap(
|
|
284
290
|
|
285
291
|
split_overlap(split, e, tlno, plno, same, parent);
|
286
292
|
if (split[1].suspect)
|
287
|
-
split_blame(blame, split, e)
|
293
|
+
if (split_blame(blame, split, e) < 0)
|
294
|
+
return -1;
|
288
295
|
decref_split(split);
|
296
|
+
|
297
|
+
return 0;
|
289
298
|
}
|
290
299
|
|
291
300
|
/*
|
@@ -293,7 +302,7 @@ static void blame_overlap(
|
|
293
302
|
* e and its parent. Find and split the overlap, and pass blame to the
|
294
303
|
* overlapping part to the parent.
|
295
304
|
*/
|
296
|
-
static
|
305
|
+
static int blame_chunk(
|
297
306
|
git_blame *blame,
|
298
307
|
size_t tlno,
|
299
308
|
size_t plno,
|
@@ -309,9 +318,12 @@ static void blame_chunk(
|
|
309
318
|
if (same <= e->s_lno)
|
310
319
|
continue;
|
311
320
|
if (tlno < e->s_lno + e->num_lines) {
|
312
|
-
blame_overlap(blame, e, tlno, plno, same, parent)
|
321
|
+
if (blame_overlap(blame, e, tlno, plno, same, parent) < 0)
|
322
|
+
return -1;
|
313
323
|
}
|
314
324
|
}
|
325
|
+
|
326
|
+
return 0;
|
315
327
|
}
|
316
328
|
|
317
329
|
static int my_emit(
|
@@ -321,7 +333,8 @@ static int my_emit(
|
|
321
333
|
{
|
322
334
|
blame_chunk_cb_data *d = (blame_chunk_cb_data *)cb_data;
|
323
335
|
|
324
|
-
blame_chunk(d->blame, d->tlno, d->plno, start_b, d->target, d->parent)
|
336
|
+
if (blame_chunk(d->blame, d->tlno, d->plno, start_b, d->target, d->parent) < 0)
|
337
|
+
return -1;
|
325
338
|
d->plno = start_a + count_a;
|
326
339
|
d->tlno = start_b + count_b;
|
327
340
|
|
@@ -352,11 +365,14 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
|
|
352
365
|
b->size -= trimmed - recovered;
|
353
366
|
}
|
354
367
|
|
355
|
-
static int diff_hunks(mmfile_t file_a, mmfile_t file_b, void *cb_data)
|
368
|
+
static int diff_hunks(mmfile_t file_a, mmfile_t file_b, void *cb_data, git_blame_options *options)
|
356
369
|
{
|
357
|
-
xpparam_t xpp = {0};
|
358
370
|
xdemitconf_t xecfg = {0};
|
359
371
|
xdemitcb_t ecb = {0};
|
372
|
+
xpparam_t xpp = {0};
|
373
|
+
|
374
|
+
if (options->flags & GIT_BLAME_IGNORE_WHITESPACE)
|
375
|
+
xpp.flags |= XDF_IGNORE_WHITESPACE;
|
360
376
|
|
361
377
|
xecfg.hunk_func = my_emit;
|
362
378
|
ecb.priv = cb_data;
|
@@ -396,11 +412,12 @@ static int pass_blame_to_parent(
|
|
396
412
|
fill_origin_blob(parent, &file_p);
|
397
413
|
fill_origin_blob(target, &file_o);
|
398
414
|
|
399
|
-
if (diff_hunks(file_p, file_o, &d) < 0)
|
415
|
+
if (diff_hunks(file_p, file_o, &d, &blame->options) < 0)
|
400
416
|
return -1;
|
401
417
|
|
402
418
|
/* The reset (i.e. anything after tlno) are the same as the parent */
|
403
|
-
blame_chunk(blame, d.tlno, d.plno, last_in_target, target, parent)
|
419
|
+
if (blame_chunk(blame, d.tlno, d.plno, last_in_target, target, parent) < 0)
|
420
|
+
return -1;
|
404
421
|
|
405
422
|
return 0;
|
406
423
|
}
|