rugged 0.27.10 → 0.27.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/AUTHORS +0 -1
- data/vendor/libgit2/CMakeLists.txt +54 -98
- data/vendor/libgit2/COPYING +0 -28
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +1 -15
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +8 -9
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +0 -6
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/http-parser/{COPYING → LICENSE-MIT} +0 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +6 -11
- data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
- data/vendor/libgit2/deps/regex/config.h +7 -0
- data/vendor/libgit2/deps/regex/regcomp.c +3857 -0
- data/vendor/libgit2/deps/regex/regex.c +92 -0
- data/vendor/libgit2/deps/regex/regex.h +582 -0
- data/vendor/libgit2/deps/regex/regex_internal.c +1744 -0
- data/vendor/libgit2/deps/regex/regex_internal.h +819 -0
- data/vendor/libgit2/deps/regex/regexec.c +4369 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +0 -1
- data/vendor/libgit2/deps/zlib/adler32.c +7 -0
- data/vendor/libgit2/deps/zlib/crc32.c +7 -0
- data/vendor/libgit2/include/git2.h +0 -5
- data/vendor/libgit2/include/git2/annotated_commit.h +0 -9
- data/vendor/libgit2/include/git2/attr.h +20 -38
- data/vendor/libgit2/include/git2/blame.h +25 -42
- data/vendor/libgit2/include/git2/blob.h +13 -45
- data/vendor/libgit2/include/git2/branch.h +1 -1
- data/vendor/libgit2/include/git2/buffer.h +16 -22
- data/vendor/libgit2/include/git2/checkout.h +32 -65
- data/vendor/libgit2/include/git2/cherrypick.h +7 -9
- data/vendor/libgit2/include/git2/clone.h +10 -12
- data/vendor/libgit2/include/git2/commit.h +3 -53
- data/vendor/libgit2/include/git2/common.h +8 -60
- data/vendor/libgit2/include/git2/config.h +19 -30
- data/vendor/libgit2/include/git2/describe.h +9 -32
- data/vendor/libgit2/include/git2/diff.h +156 -208
- data/vendor/libgit2/include/git2/errors.h +46 -54
- data/vendor/libgit2/include/git2/filter.h +0 -8
- data/vendor/libgit2/include/git2/ignore.h +2 -2
- data/vendor/libgit2/include/git2/index.h +52 -74
- data/vendor/libgit2/include/git2/indexer.h +6 -76
- data/vendor/libgit2/include/git2/inttypes.h +309 -0
- data/vendor/libgit2/include/git2/merge.h +18 -35
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +1 -1
- data/vendor/libgit2/include/git2/object.h +29 -17
- data/vendor/libgit2/include/git2/odb.h +11 -12
- data/vendor/libgit2/include/git2/odb_backend.h +9 -10
- data/vendor/libgit2/include/git2/oid.h +2 -2
- data/vendor/libgit2/include/git2/pack.h +3 -14
- data/vendor/libgit2/include/git2/proxy.h +8 -14
- data/vendor/libgit2/include/git2/rebase.h +6 -53
- data/vendor/libgit2/include/git2/refs.h +15 -33
- data/vendor/libgit2/include/git2/refspec.h +0 -17
- data/vendor/libgit2/include/git2/remote.h +24 -123
- data/vendor/libgit2/include/git2/repository.h +39 -76
- data/vendor/libgit2/include/git2/revert.h +4 -6
- data/vendor/libgit2/include/git2/revwalk.h +7 -7
- data/vendor/libgit2/include/git2/signature.h +2 -2
- data/vendor/libgit2/include/git2/stash.h +12 -15
- data/vendor/libgit2/include/git2/status.h +20 -33
- data/vendor/libgit2/include/git2/submodule.h +12 -30
- data/vendor/libgit2/include/git2/sys/commit.h +1 -1
- data/vendor/libgit2/include/git2/sys/config.h +13 -13
- data/vendor/libgit2/include/git2/sys/filter.h +6 -6
- data/vendor/libgit2/include/git2/sys/index.h +0 -3
- data/vendor/libgit2/include/git2/sys/mempack.h +35 -35
- data/vendor/libgit2/include/git2/sys/merge.h +4 -9
- data/vendor/libgit2/include/git2/sys/odb_backend.h +22 -66
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +40 -76
- data/vendor/libgit2/include/git2/sys/repository.h +1 -5
- data/vendor/libgit2/include/git2/sys/stream.h +12 -92
- data/vendor/libgit2/include/git2/sys/time.h +31 -0
- data/vendor/libgit2/include/git2/sys/transport.h +83 -129
- data/vendor/libgit2/include/git2/tag.h +4 -13
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transaction.h +0 -1
- data/vendor/libgit2/include/git2/transport.h +311 -11
- data/vendor/libgit2/include/git2/tree.h +4 -4
- data/vendor/libgit2/include/git2/types.h +111 -33
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -48
- data/vendor/libgit2/libgit2.pc.in +13 -0
- data/vendor/libgit2/src/CMakeLists.txt +164 -96
- data/vendor/libgit2/src/annotated_commit.c +8 -15
- data/vendor/libgit2/src/apply.c +31 -537
- data/vendor/libgit2/src/apply.h +1 -3
- data/vendor/libgit2/src/array.h +2 -2
- data/vendor/libgit2/src/attr.c +75 -81
- data/vendor/libgit2/src/attr_file.c +121 -207
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +53 -51
- data/vendor/libgit2/src/attrcache.h +1 -2
- data/vendor/libgit2/src/blame.c +20 -47
- data/vendor/libgit2/src/blame.h +1 -2
- data/vendor/libgit2/src/blame_git.c +20 -37
- data/vendor/libgit2/src/blob.c +42 -128
- data/vendor/libgit2/src/blob.h +2 -19
- data/vendor/libgit2/src/branch.c +43 -67
- data/vendor/libgit2/src/buf_text.c +6 -7
- data/vendor/libgit2/src/buffer.c +57 -69
- data/vendor/libgit2/src/buffer.h +1 -1
- data/vendor/libgit2/src/cache.c +45 -38
- data/vendor/libgit2/src/cache.h +3 -3
- data/vendor/libgit2/src/cc-compat.h +3 -20
- data/vendor/libgit2/src/checkout.c +90 -109
- data/vendor/libgit2/src/cherrypick.c +9 -15
- data/vendor/libgit2/src/clone.c +27 -49
- data/vendor/libgit2/src/clone.h +0 -4
- data/vendor/libgit2/src/commit.c +49 -117
- data/vendor/libgit2/src/commit.h +0 -7
- data/vendor/libgit2/src/commit_list.c +78 -30
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +91 -27
- data/vendor/libgit2/src/config.c +176 -194
- data/vendor/libgit2/src/config.h +20 -8
- data/vendor/libgit2/src/config_cache.c +35 -41
- data/vendor/libgit2/src/config_file.c +753 -439
- data/vendor/libgit2/src/config_file.h +73 -0
- data/vendor/libgit2/src/config_parse.c +63 -114
- data/vendor/libgit2/src/config_parse.h +16 -17
- data/vendor/libgit2/src/crlf.c +190 -219
- data/vendor/libgit2/src/delta.c +18 -25
- data/vendor/libgit2/src/describe.c +41 -42
- data/vendor/libgit2/src/diff.c +68 -53
- data/vendor/libgit2/src/diff.h +1 -2
- data/vendor/libgit2/src/diff_driver.c +49 -47
- data/vendor/libgit2/src/diff_file.c +17 -19
- data/vendor/libgit2/src/diff_file.h +1 -1
- data/vendor/libgit2/src/diff_generate.c +106 -162
- data/vendor/libgit2/src/diff_generate.h +3 -3
- data/vendor/libgit2/src/diff_parse.c +4 -4
- data/vendor/libgit2/src/diff_print.c +30 -42
- data/vendor/libgit2/src/diff_stats.c +7 -22
- data/vendor/libgit2/src/diff_tform.c +16 -16
- data/vendor/libgit2/src/diff_xdiff.c +3 -15
- data/vendor/libgit2/src/errors.c +39 -51
- data/vendor/libgit2/src/features.h.in +3 -11
- data/vendor/libgit2/src/fetch.c +5 -10
- data/vendor/libgit2/src/fetchhead.c +17 -17
- data/vendor/libgit2/src/filebuf.c +36 -32
- data/vendor/libgit2/src/filebuf.h +2 -2
- data/vendor/libgit2/src/{futils.c → fileops.c} +73 -80
- data/vendor/libgit2/src/{futils.h → fileops.h} +6 -6
- data/vendor/libgit2/src/filter.c +38 -46
- data/vendor/libgit2/src/filter.h +10 -0
- data/vendor/libgit2/src/fnmatch.c +248 -0
- data/vendor/libgit2/src/fnmatch.h +48 -0
- data/vendor/libgit2/src/global.c +63 -48
- data/vendor/libgit2/src/global.h +2 -0
- data/vendor/libgit2/src/hash.c +0 -61
- data/vendor/libgit2/src/hash.h +19 -20
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +47 -0
- data/vendor/libgit2/src/hash/{sha1/common_crypto.c → hash_common_crypto.h} +17 -17
- data/vendor/libgit2/src/hash/{sha1/generic.c → hash_generic.c} +10 -22
- data/vendor/libgit2/src/hash/{sha1/generic.h → hash_generic.h} +10 -4
- data/vendor/libgit2/src/hash/hash_openssl.h +59 -0
- data/vendor/libgit2/src/hash/{sha1/win32.c → hash_win32.c} +37 -47
- data/vendor/libgit2/src/hash/{sha1/win32.h → hash_win32.h} +19 -6
- data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/sha1.c +3 -14
- data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hashsig.c +5 -5
- data/vendor/libgit2/src/idxmap.c +61 -107
- data/vendor/libgit2/src/idxmap.h +31 -153
- data/vendor/libgit2/src/ignore.c +47 -43
- data/vendor/libgit2/src/index.c +232 -337
- data/vendor/libgit2/src/index.h +1 -17
- data/vendor/libgit2/src/indexer.c +175 -346
- data/vendor/libgit2/src/integer.h +26 -71
- data/vendor/libgit2/src/iterator.c +70 -142
- data/vendor/libgit2/src/iterator.h +0 -15
- data/vendor/libgit2/src/khash.h +1 -3
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +100 -144
- data/vendor/libgit2/src/merge_driver.c +11 -11
- data/vendor/libgit2/src/merge_file.c +2 -2
- data/vendor/libgit2/src/mwindow.c +29 -24
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/netops.c +156 -55
- data/vendor/libgit2/src/netops.h +23 -3
- data/vendor/libgit2/src/notes.c +11 -16
- data/vendor/libgit2/src/object.c +69 -120
- data/vendor/libgit2/src/object.h +9 -22
- data/vendor/libgit2/src/object_api.c +8 -8
- data/vendor/libgit2/src/odb.c +93 -116
- data/vendor/libgit2/src/odb.h +7 -8
- data/vendor/libgit2/src/odb_loose.c +55 -62
- data/vendor/libgit2/src/odb_mempack.c +34 -21
- data/vendor/libgit2/src/odb_pack.c +14 -18
- data/vendor/libgit2/src/offmap.c +35 -53
- data/vendor/libgit2/src/offmap.h +21 -108
- data/vendor/libgit2/src/oid.c +7 -12
- data/vendor/libgit2/src/oidmap.c +47 -49
- data/vendor/libgit2/src/oidmap.h +24 -101
- data/vendor/libgit2/src/pack-objects.c +87 -88
- data/vendor/libgit2/src/pack-objects.h +8 -2
- data/vendor/libgit2/src/pack.c +101 -99
- data/vendor/libgit2/src/pack.h +19 -17
- data/vendor/libgit2/src/parse.c +0 -10
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +4 -4
- data/vendor/libgit2/src/patch_generate.c +20 -20
- data/vendor/libgit2/src/patch_parse.c +63 -151
- data/vendor/libgit2/src/path.c +104 -117
- data/vendor/libgit2/src/path.h +71 -3
- data/vendor/libgit2/src/pathspec.c +19 -19
- data/vendor/libgit2/src/pool.c +22 -26
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +10 -10
- data/vendor/libgit2/src/posix.h +1 -12
- data/vendor/libgit2/src/proxy.c +3 -8
- data/vendor/libgit2/src/push.c +31 -37
- data/vendor/libgit2/src/push.h +1 -2
- data/vendor/libgit2/src/rebase.c +59 -115
- data/vendor/libgit2/src/refdb.c +3 -15
- data/vendor/libgit2/src/refdb_fs.c +254 -381
- data/vendor/libgit2/src/reflog.c +15 -13
- data/vendor/libgit2/src/refs.c +88 -118
- data/vendor/libgit2/src/refs.h +3 -5
- data/vendor/libgit2/src/refspec.c +37 -56
- data/vendor/libgit2/src/refspec.h +1 -1
- data/vendor/libgit2/src/remote.c +215 -266
- data/vendor/libgit2/src/remote.h +2 -11
- data/vendor/libgit2/src/repository.c +225 -280
- data/vendor/libgit2/src/repository.h +40 -52
- data/vendor/libgit2/src/reset.c +8 -8
- data/vendor/libgit2/src/revert.c +9 -14
- data/vendor/libgit2/src/revparse.c +48 -47
- data/vendor/libgit2/src/revwalk.c +57 -120
- data/vendor/libgit2/src/revwalk.h +1 -22
- data/vendor/libgit2/src/settings.c +10 -47
- data/vendor/libgit2/src/signature.c +11 -11
- data/vendor/libgit2/src/sortedcache.c +36 -22
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +99 -125
- data/vendor/libgit2/src/status.c +22 -28
- data/vendor/libgit2/src/stream.h +2 -17
- data/vendor/libgit2/src/streams/curl.c +385 -0
- data/vendor/libgit2/src/{allocators/stdalloc.h → streams/curl.h} +5 -5
- data/vendor/libgit2/src/streams/openssl.c +114 -224
- data/vendor/libgit2/src/streams/openssl.h +108 -4
- data/vendor/libgit2/src/streams/socket.c +30 -55
- data/vendor/libgit2/src/streams/stransport.c +32 -57
- data/vendor/libgit2/src/streams/stransport.h +0 -5
- data/vendor/libgit2/src/streams/tls.c +19 -50
- data/vendor/libgit2/src/streams/tls.h +4 -12
- data/vendor/libgit2/src/strmap.c +74 -47
- data/vendor/libgit2/src/strmap.h +33 -108
- data/vendor/libgit2/src/submodule.c +216 -272
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +19 -29
- data/vendor/libgit2/src/tag.c +28 -41
- data/vendor/libgit2/src/tag.h +1 -2
- data/vendor/libgit2/src/trace.c +2 -2
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +38 -52
- data/vendor/libgit2/src/transaction.c +29 -30
- data/vendor/libgit2/src/transport.c +5 -5
- data/vendor/libgit2/src/transports/auth.c +11 -15
- data/vendor/libgit2/src/transports/auth.h +3 -10
- data/vendor/libgit2/src/transports/auth_negotiate.c +18 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/cred.c +24 -24
- data/vendor/libgit2/src/{allocators/win32_crtdbg.h → transports/cred.h} +4 -5
- data/vendor/libgit2/src/transports/git.c +31 -26
- data/vendor/libgit2/src/transports/http.c +348 -881
- data/vendor/libgit2/src/transports/http.h +0 -2
- data/vendor/libgit2/src/transports/local.c +35 -35
- data/vendor/libgit2/src/transports/smart.c +47 -70
- data/vendor/libgit2/src/transports/smart.h +4 -3
- data/vendor/libgit2/src/transports/smart_pkt.c +40 -43
- data/vendor/libgit2/src/transports/smart_protocol.c +116 -96
- data/vendor/libgit2/src/transports/ssh.c +66 -77
- data/vendor/libgit2/src/transports/winhttp.c +314 -318
- data/vendor/libgit2/src/tree-cache.c +12 -19
- data/vendor/libgit2/src/tree.c +142 -103
- data/vendor/libgit2/src/tree.h +12 -1
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +11 -1
- data/vendor/libgit2/src/userdiff.h +1 -3
- data/vendor/libgit2/src/util.c +56 -70
- data/vendor/libgit2/src/util.h +156 -28
- data/vendor/libgit2/src/vector.c +4 -4
- data/vendor/libgit2/src/win32/dir.c +3 -3
- data/vendor/libgit2/src/win32/findfile.c +3 -3
- data/vendor/libgit2/src/win32/map.c +11 -9
- data/vendor/libgit2/src/win32/msvc-compat.h +0 -6
- data/vendor/libgit2/src/win32/path_w32.c +9 -113
- data/vendor/libgit2/src/win32/path_w32.h +29 -18
- data/vendor/libgit2/src/win32/posix.h +4 -1
- data/vendor/libgit2/src/win32/posix_w32.c +45 -70
- data/vendor/libgit2/src/win32/precompiled.h +2 -0
- data/vendor/libgit2/src/win32/thread.c +10 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +5 -9
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +2 -3
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +75 -26
- data/vendor/libgit2/src/win32/w32_stack.c +11 -6
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +64 -27
- data/vendor/libgit2/src/win32/w32_util.h +49 -5
- data/vendor/libgit2/src/worktree.c +60 -95
- data/vendor/libgit2/src/worktree.h +0 -2
- data/vendor/libgit2/src/xdiff/xdiffi.c +5 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +15 -27
- data/vendor/libgit2/src/xdiff/xpatience.c +0 -3
- data/vendor/libgit2/src/zstream.c +4 -4
- metadata +33 -122
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +0 -28
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +0 -38
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +0 -37
- data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +0 -93
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +0 -110
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +0 -53
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +0 -124
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +0 -66
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +0 -21
- data/vendor/libgit2/deps/ntlmclient/compat.h +0 -33
- data/vendor/libgit2/deps/ntlmclient/crypt.h +0 -64
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +0 -120
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +0 -18
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +0 -145
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +0 -18
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +0 -130
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +0 -21
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +0 -1420
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +0 -174
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +0 -320
- data/vendor/libgit2/deps/ntlmclient/unicode.h +0 -36
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +0 -445
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +0 -201
- data/vendor/libgit2/deps/ntlmclient/utf8.h +0 -1257
- data/vendor/libgit2/deps/ntlmclient/util.c +0 -21
- data/vendor/libgit2/deps/ntlmclient/util.h +0 -14
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +0 -140
- data/vendor/libgit2/deps/pcre/COPYING +0 -5
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +0 -22
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +0 -17
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +0 -58
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +0 -29
- data/vendor/libgit2/deps/pcre/config.h.in +0 -57
- data/vendor/libgit2/deps/pcre/pcre.h +0 -641
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +0 -319
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +0 -198
- data/vendor/libgit2/deps/pcre/pcre_compile.c +0 -9800
- data/vendor/libgit2/deps/pcre/pcre_config.c +0 -190
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +0 -3676
- data/vendor/libgit2/deps/pcre/pcre_exec.c +0 -7173
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +0 -245
- data/vendor/libgit2/deps/pcre/pcre_get.c +0 -669
- data/vendor/libgit2/deps/pcre/pcre_globals.c +0 -86
- data/vendor/libgit2/deps/pcre/pcre_internal.h +0 -2787
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +0 -11913
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +0 -156
- data/vendor/libgit2/deps/pcre/pcre_newline.c +0 -210
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +0 -94
- data/vendor/libgit2/deps/pcre/pcre_printint.c +0 -834
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +0 -92
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +0 -211
- data/vendor/libgit2/deps/pcre/pcre_study.c +0 -1686
- data/vendor/libgit2/deps/pcre/pcre_tables.c +0 -727
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +0 -3644
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +0 -301
- data/vendor/libgit2/deps/pcre/pcre_version.c +0 -98
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +0 -268
- data/vendor/libgit2/deps/pcre/pcreposix.c +0 -421
- data/vendor/libgit2/deps/pcre/pcreposix.h +0 -117
- data/vendor/libgit2/deps/pcre/ucp.h +0 -224
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +0 -993
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +0 -502
- data/vendor/libgit2/deps/zlib/COPYING +0 -27
- data/vendor/libgit2/include/git2/apply.h +0 -149
- data/vendor/libgit2/include/git2/cert.h +0 -135
- data/vendor/libgit2/include/git2/cred.h +0 -308
- data/vendor/libgit2/include/git2/deprecated.h +0 -493
- data/vendor/libgit2/include/git2/mailmap.h +0 -115
- data/vendor/libgit2/include/git2/sys/alloc.h +0 -101
- data/vendor/libgit2/include/git2/sys/cred.h +0 -90
- data/vendor/libgit2/include/git2/sys/path.h +0 -64
- data/vendor/libgit2/src/alloc.c +0 -43
- data/vendor/libgit2/src/alloc.h +0 -40
- data/vendor/libgit2/src/allocators/stdalloc.c +0 -119
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/config_backend.h +0 -96
- data/vendor/libgit2/src/config_entries.c +0 -229
- data/vendor/libgit2/src/config_entries.h +0 -24
- data/vendor/libgit2/src/config_mem.c +0 -220
- data/vendor/libgit2/src/config_snapshot.c +0 -206
- data/vendor/libgit2/src/errors.h +0 -81
- data/vendor/libgit2/src/hash/sha1.h +0 -38
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +0 -48
- data/vendor/libgit2/src/hash/sha1/collisiondetect.h +0 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +0 -19
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
- data/vendor/libgit2/src/hash/sha1/mbedtls.h +0 -19
- data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
- data/vendor/libgit2/src/hash/sha1/openssl.h +0 -19
- data/vendor/libgit2/src/mailmap.c +0 -485
- data/vendor/libgit2/src/mailmap.h +0 -35
- data/vendor/libgit2/src/net.c +0 -184
- data/vendor/libgit2/src/net.h +0 -36
- data/vendor/libgit2/src/reader.c +0 -265
- data/vendor/libgit2/src/reader.h +0 -107
- data/vendor/libgit2/src/regexp.c +0 -221
- data/vendor/libgit2/src/regexp.h +0 -97
- data/vendor/libgit2/src/streams/mbedtls.c +0 -483
- data/vendor/libgit2/src/streams/mbedtls.h +0 -23
- data/vendor/libgit2/src/streams/registry.c +0 -118
- data/vendor/libgit2/src/streams/registry.h +0 -19
- data/vendor/libgit2/src/transports/auth_ntlm.c +0 -223
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -35
- data/vendor/libgit2/src/wildmatch.c +0 -320
- data/vendor/libgit2/src/wildmatch.h +0 -23
- data/vendor/libgit2/src/win32/w32_common.h +0 -39
data/vendor/libgit2/src/blob.h
CHANGED
@@ -12,32 +12,15 @@
|
|
12
12
|
#include "git2/blob.h"
|
13
13
|
#include "repository.h"
|
14
14
|
#include "odb.h"
|
15
|
-
#include "
|
15
|
+
#include "fileops.h"
|
16
16
|
|
17
17
|
struct git_blob {
|
18
18
|
git_object object;
|
19
|
-
|
20
|
-
union {
|
21
|
-
git_odb_object *odb;
|
22
|
-
struct {
|
23
|
-
const char *data;
|
24
|
-
git_object_size_t size;
|
25
|
-
} raw;
|
26
|
-
} data;
|
27
|
-
unsigned int raw:1;
|
19
|
+
git_odb_object *odb_object;
|
28
20
|
};
|
29
21
|
|
30
|
-
#define GIT_ERROR_CHECK_BLOBSIZE(n) \
|
31
|
-
do { \
|
32
|
-
if (!git__is_sizet(n)) { \
|
33
|
-
git_error_set(GIT_ERROR_NOMEMORY, "blob contents too large to fit in memory"); \
|
34
|
-
return -1; \
|
35
|
-
} \
|
36
|
-
} while(0)
|
37
|
-
|
38
22
|
void git_blob__free(void *blob);
|
39
23
|
int git_blob__parse(void *blob, git_odb_object *obj);
|
40
|
-
int git_blob__parse_raw(void *blob, const char *data, size_t size);
|
41
24
|
int git_blob__getbuf(git_buf *buffer, git_blob *blob);
|
42
25
|
|
43
26
|
extern int git_blob__create_from_paths(
|
data/vendor/libgit2/src/branch.c
CHANGED
@@ -22,7 +22,7 @@ static int retrieve_branch_reference(
|
|
22
22
|
git_reference **branch_reference_out,
|
23
23
|
git_repository *repo,
|
24
24
|
const char *branch_name,
|
25
|
-
|
25
|
+
int is_remote)
|
26
26
|
{
|
27
27
|
git_reference *branch = NULL;
|
28
28
|
int error = 0;
|
@@ -34,20 +34,20 @@ static int retrieve_branch_reference(
|
|
34
34
|
if ((error = git_buf_joinpath(&ref_name, prefix, branch_name)) < 0)
|
35
35
|
/* OOM */;
|
36
36
|
else if ((error = git_reference_lookup(&branch, repo, ref_name.ptr)) < 0)
|
37
|
-
|
38
|
-
|
37
|
+
giterr_set(
|
38
|
+
GITERR_REFERENCE, "cannot locate %s branch '%s'",
|
39
39
|
is_remote ? "remote-tracking" : "local", branch_name);
|
40
40
|
|
41
41
|
*branch_reference_out = branch; /* will be NULL on error */
|
42
42
|
|
43
|
-
|
43
|
+
git_buf_free(&ref_name);
|
44
44
|
return error;
|
45
45
|
}
|
46
46
|
|
47
47
|
static int not_a_local_branch(const char *reference_name)
|
48
48
|
{
|
49
|
-
|
50
|
-
|
49
|
+
giterr_set(
|
50
|
+
GITERR_INVALID,
|
51
51
|
"reference '%s' is not a local branch.", reference_name);
|
52
52
|
return -1;
|
53
53
|
}
|
@@ -71,7 +71,7 @@ static int create_branch(
|
|
71
71
|
assert(git_object_owner((const git_object *)commit) == repository);
|
72
72
|
|
73
73
|
if (!git__strcmp(branch_name, "HEAD")) {
|
74
|
-
|
74
|
+
giterr_set(GITERR_REFERENCE, "'HEAD' is not a valid branch name");
|
75
75
|
error = -1;
|
76
76
|
goto cleanup;
|
77
77
|
}
|
@@ -88,7 +88,7 @@ static int create_branch(
|
|
88
88
|
}
|
89
89
|
|
90
90
|
if (is_unmovable_head && force) {
|
91
|
-
|
91
|
+
giterr_set(GITERR_REFERENCE, "cannot force update branch '%s' as it is "
|
92
92
|
"the current HEAD of the repository.", branch_name);
|
93
93
|
error = -1;
|
94
94
|
goto cleanup;
|
@@ -108,8 +108,8 @@ static int create_branch(
|
|
108
108
|
*ref_out = branch;
|
109
109
|
|
110
110
|
cleanup:
|
111
|
-
|
112
|
-
|
111
|
+
git_buf_free(&canonical_branch_name);
|
112
|
+
git_buf_free(&log_message);
|
113
113
|
return error;
|
114
114
|
}
|
115
115
|
|
@@ -141,7 +141,7 @@ static int branch_equals(git_repository *repo, const char *path, void *payload)
|
|
141
141
|
int equal = 0;
|
142
142
|
|
143
143
|
if (git_reference__read_head(&head, repo, path) < 0 ||
|
144
|
-
git_reference_type(head) !=
|
144
|
+
git_reference_type(head) != GIT_REF_SYMBOLIC)
|
145
145
|
goto done;
|
146
146
|
|
147
147
|
equal = !git__strcmp(head->target.symbolic, branch->name);
|
@@ -153,20 +153,10 @@ done:
|
|
153
153
|
|
154
154
|
int git_branch_is_checked_out(const git_reference *branch)
|
155
155
|
{
|
156
|
-
|
157
|
-
int flags = 0;
|
158
|
-
|
159
|
-
assert(branch);
|
156
|
+
assert(branch && git_reference_is_branch(branch));
|
160
157
|
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
repo = git_reference_owner(branch);
|
165
|
-
|
166
|
-
if (git_repository_is_bare(repo))
|
167
|
-
flags |= GIT_REPOSITORY_FOREACH_HEAD_SKIP_REPO;
|
168
|
-
|
169
|
-
return git_repository_foreach_head(repo, branch_equals, flags, (void *) branch) == 1;
|
158
|
+
return git_repository_foreach_head(git_reference_owner(branch),
|
159
|
+
branch_equals, (void *) branch) == 1;
|
170
160
|
}
|
171
161
|
|
172
162
|
int git_branch_delete(git_reference *branch)
|
@@ -178,7 +168,7 @@ int git_branch_delete(git_reference *branch)
|
|
178
168
|
assert(branch);
|
179
169
|
|
180
170
|
if (!git_reference_is_branch(branch) && !git_reference_is_remote(branch)) {
|
181
|
-
|
171
|
+
giterr_set(GITERR_INVALID, "reference '%s' is not a valid branch.",
|
182
172
|
git_reference_name(branch));
|
183
173
|
return GIT_ENOTFOUND;
|
184
174
|
}
|
@@ -187,13 +177,13 @@ int git_branch_delete(git_reference *branch)
|
|
187
177
|
return is_head;
|
188
178
|
|
189
179
|
if (is_head) {
|
190
|
-
|
180
|
+
giterr_set(GITERR_REFERENCE, "cannot delete branch '%s' as it is "
|
191
181
|
"the current HEAD of the repository.", git_reference_name(branch));
|
192
182
|
return -1;
|
193
183
|
}
|
194
184
|
|
195
185
|
if (git_reference_is_branch(branch) && git_branch_is_checked_out(branch)) {
|
196
|
-
|
186
|
+
giterr_set(GITERR_REFERENCE, "Cannot delete branch '%s' as it is "
|
197
187
|
"the current HEAD of a linked repository.", git_reference_name(branch));
|
198
188
|
return -1;
|
199
189
|
}
|
@@ -209,7 +199,7 @@ int git_branch_delete(git_reference *branch)
|
|
209
199
|
error = git_reference_delete(branch);
|
210
200
|
|
211
201
|
on_error:
|
212
|
-
|
202
|
+
git_buf_free(&config_section);
|
213
203
|
return error;
|
214
204
|
}
|
215
205
|
|
@@ -253,7 +243,7 @@ int git_branch_iterator_new(
|
|
253
243
|
branch_iter *iter;
|
254
244
|
|
255
245
|
iter = git__calloc(1, sizeof(branch_iter));
|
256
|
-
|
246
|
+
GITERR_CHECK_ALLOC(iter);
|
257
247
|
|
258
248
|
iter->flags = list_flags;
|
259
249
|
|
@@ -320,10 +310,10 @@ int git_branch_move(
|
|
320
310
|
git_buf_cstr(&new_config_section));
|
321
311
|
|
322
312
|
done:
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
313
|
+
git_buf_free(&new_reference_name);
|
314
|
+
git_buf_free(&old_config_section);
|
315
|
+
git_buf_free(&new_config_section);
|
316
|
+
git_buf_free(&log_message);
|
327
317
|
|
328
318
|
return error;
|
329
319
|
}
|
@@ -334,23 +324,9 @@ int git_branch_lookup(
|
|
334
324
|
const char *branch_name,
|
335
325
|
git_branch_t branch_type)
|
336
326
|
{
|
337
|
-
int error = -1;
|
338
327
|
assert(ref_out && repo && branch_name);
|
339
328
|
|
340
|
-
|
341
|
-
case GIT_BRANCH_LOCAL:
|
342
|
-
case GIT_BRANCH_REMOTE:
|
343
|
-
error = retrieve_branch_reference(ref_out, repo, branch_name, branch_type == GIT_BRANCH_REMOTE);
|
344
|
-
break;
|
345
|
-
case GIT_BRANCH_ALL:
|
346
|
-
error = retrieve_branch_reference(ref_out, repo, branch_name, false);
|
347
|
-
if (error == GIT_ENOTFOUND)
|
348
|
-
error = retrieve_branch_reference(ref_out, repo, branch_name, true);
|
349
|
-
break;
|
350
|
-
default:
|
351
|
-
assert(false);
|
352
|
-
}
|
353
|
-
return error;
|
329
|
+
return retrieve_branch_reference(ref_out, repo, branch_name, branch_type == GIT_BRANCH_REMOTE);
|
354
330
|
}
|
355
331
|
|
356
332
|
int git_branch_name(
|
@@ -368,7 +344,7 @@ int git_branch_name(
|
|
368
344
|
} else if (git_reference_is_remote(ref)) {
|
369
345
|
branch_name += strlen(GIT_REFS_REMOTES_DIR);
|
370
346
|
} else {
|
371
|
-
|
347
|
+
giterr_set(GITERR_INVALID,
|
372
348
|
"reference '%s' is neither a local nor a remote branch.", ref->name);
|
373
349
|
return -1;
|
374
350
|
}
|
@@ -390,7 +366,7 @@ static int retrieve_upstream_configuration(
|
|
390
366
|
return -1;
|
391
367
|
|
392
368
|
error = git_config_get_string_buf(out, config, git_buf_cstr(&buf));
|
393
|
-
|
369
|
+
git_buf_free(&buf);
|
394
370
|
return error;
|
395
371
|
}
|
396
372
|
|
@@ -426,7 +402,7 @@ int git_branch_upstream_name(
|
|
426
402
|
goto cleanup;
|
427
403
|
|
428
404
|
if (git_buf_len(&remote_name) == 0 || git_buf_len(&merge_name) == 0) {
|
429
|
-
|
405
|
+
giterr_set(GITERR_REFERENCE,
|
430
406
|
"branch '%s' does not have an upstream", refname);
|
431
407
|
error = GIT_ENOTFOUND;
|
432
408
|
goto cleanup;
|
@@ -453,9 +429,9 @@ int git_branch_upstream_name(
|
|
453
429
|
cleanup:
|
454
430
|
git_config_free(config);
|
455
431
|
git_remote_free(remote);
|
456
|
-
|
457
|
-
|
458
|
-
|
432
|
+
git_buf_free(&remote_name);
|
433
|
+
git_buf_free(&merge_name);
|
434
|
+
git_buf_free(&buf);
|
459
435
|
return error;
|
460
436
|
}
|
461
437
|
|
@@ -476,7 +452,7 @@ int git_branch_upstream_remote(git_buf *buf, git_repository *repo, const char *r
|
|
476
452
|
return error;
|
477
453
|
|
478
454
|
if (git_buf_len(buf) == 0) {
|
479
|
-
|
455
|
+
giterr_set(GITERR_REFERENCE, "branch '%s' does not have an upstream remote", refname);
|
480
456
|
error = GIT_ENOTFOUND;
|
481
457
|
git_buf_clear(buf);
|
482
458
|
}
|
@@ -499,7 +475,7 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
499
475
|
|
500
476
|
/* Verify that this is a remote branch */
|
501
477
|
if (!git_reference__is_remote(refname)) {
|
502
|
-
|
478
|
+
giterr_set(GITERR_INVALID, "reference '%s' is not a remote branch.",
|
503
479
|
refname);
|
504
480
|
error = GIT_ERROR;
|
505
481
|
goto cleanup;
|
@@ -525,7 +501,7 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
525
501
|
} else {
|
526
502
|
git_remote_free(remote);
|
527
503
|
|
528
|
-
|
504
|
+
giterr_set(GITERR_REFERENCE,
|
529
505
|
"reference '%s' is ambiguous", refname);
|
530
506
|
error = GIT_EAMBIGUOUS;
|
531
507
|
goto cleanup;
|
@@ -539,14 +515,14 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
539
515
|
git_buf_clear(buf);
|
540
516
|
error = git_buf_puts(buf, remote_name);
|
541
517
|
} else {
|
542
|
-
|
518
|
+
giterr_set(GITERR_REFERENCE,
|
543
519
|
"could not determine remote for '%s'", refname);
|
544
520
|
error = GIT_ENOTFOUND;
|
545
521
|
}
|
546
522
|
|
547
523
|
cleanup:
|
548
524
|
if (error < 0)
|
549
|
-
|
525
|
+
git_buf_free(buf);
|
550
526
|
|
551
527
|
git_strarray_free(&remote_list);
|
552
528
|
return error;
|
@@ -568,7 +544,7 @@ int git_branch_upstream(
|
|
568
544
|
git_reference_owner(branch),
|
569
545
|
git_buf_cstr(&tracking_name));
|
570
546
|
|
571
|
-
|
547
|
+
git_buf_free(&tracking_name);
|
572
548
|
return error;
|
573
549
|
}
|
574
550
|
|
@@ -589,11 +565,11 @@ static int unset_upstream(git_config *config, const char *shortname)
|
|
589
565
|
if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0)
|
590
566
|
goto on_error;
|
591
567
|
|
592
|
-
|
568
|
+
git_buf_free(&buf);
|
593
569
|
return 0;
|
594
570
|
|
595
571
|
on_error:
|
596
|
-
|
572
|
+
git_buf_free(&buf);
|
597
573
|
return -1;
|
598
574
|
}
|
599
575
|
|
@@ -628,7 +604,7 @@ int git_branch_set_upstream(git_reference *branch, const char *upstream_name)
|
|
628
604
|
else if (git_branch_lookup(&upstream, repo, upstream_name, GIT_BRANCH_REMOTE) == 0)
|
629
605
|
local = 0;
|
630
606
|
else {
|
631
|
-
|
607
|
+
giterr_set(GITERR_REFERENCE,
|
632
608
|
"cannot set upstream for branch '%s'", shortname);
|
633
609
|
return GIT_ENOTFOUND;
|
634
610
|
}
|
@@ -679,15 +655,15 @@ int git_branch_set_upstream(git_reference *branch, const char *upstream_name)
|
|
679
655
|
goto on_error;
|
680
656
|
|
681
657
|
git_reference_free(upstream);
|
682
|
-
|
683
|
-
|
658
|
+
git_buf_free(&key);
|
659
|
+
git_buf_free(&value);
|
684
660
|
|
685
661
|
return 0;
|
686
662
|
|
687
663
|
on_error:
|
688
664
|
git_reference_free(upstream);
|
689
|
-
|
690
|
-
|
665
|
+
git_buf_free(&key);
|
666
|
+
git_buf_free(&value);
|
691
667
|
git_remote_free(remote);
|
692
668
|
|
693
669
|
return -1;
|
@@ -29,7 +29,7 @@ int git_buf_text_puts_escaped(
|
|
29
29
|
scan += count;
|
30
30
|
}
|
31
31
|
|
32
|
-
|
32
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, total, 1);
|
33
33
|
if (git_buf_grow_by(buf, alloclen) < 0)
|
34
34
|
return -1;
|
35
35
|
|
@@ -75,7 +75,7 @@ int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src)
|
|
75
75
|
return git_buf_set(tgt, src->ptr, src->size);
|
76
76
|
|
77
77
|
/* reduce reallocs while in the loop */
|
78
|
-
|
78
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, src->size, 1);
|
79
79
|
if (git_buf_grow(tgt, new_size) < 0)
|
80
80
|
return -1;
|
81
81
|
|
@@ -122,8 +122,8 @@ int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
122
122
|
return git_buf_set(tgt, src->ptr, src->size);
|
123
123
|
|
124
124
|
/* attempt to reduce reallocs while in the loop */
|
125
|
-
|
126
|
-
|
125
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, src->size, src->size >> 4);
|
126
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
|
127
127
|
if (git_buf_grow(tgt, alloclen) < 0)
|
128
128
|
return -1;
|
129
129
|
tgt->size = 0;
|
@@ -135,7 +135,7 @@ int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
135
135
|
if (copylen && next[-1] == '\r')
|
136
136
|
copylen--;
|
137
137
|
|
138
|
-
|
138
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, copylen, 3);
|
139
139
|
if (git_buf_grow_by(tgt, alloclen) < 0)
|
140
140
|
return -1;
|
141
141
|
|
@@ -310,7 +310,6 @@ bool git_buf_text_gather_stats(
|
|
310
310
|
}
|
311
311
|
}
|
312
312
|
|
313
|
-
|
314
|
-
return (stats->cr != stats->crlf || stats->nul > 0 ||
|
313
|
+
return (stats->nul > 0 ||
|
315
314
|
((stats->printable >> 7) < stats->nonprintable));
|
316
315
|
}
|
data/vendor/libgit2/src/buffer.c
CHANGED
@@ -18,8 +18,7 @@ char git_buf__initbuf[1];
|
|
18
18
|
char git_buf__oom[1];
|
19
19
|
|
20
20
|
#define ENSURE_SIZE(b, d) \
|
21
|
-
if ((b)->
|
22
|
-
((d) > (b)->asize && git_buf_grow((b), (d)) < 0))\
|
21
|
+
if ((d) > (b)->asize && git_buf_grow((b), (d)) < 0)\
|
23
22
|
return -1;
|
24
23
|
|
25
24
|
|
@@ -44,7 +43,7 @@ int git_buf_try_grow(
|
|
44
43
|
return -1;
|
45
44
|
|
46
45
|
if (buf->asize == 0 && buf->size != 0) {
|
47
|
-
|
46
|
+
giterr_set(GITERR_INVALID, "cannot grow a borrowed buffer");
|
48
47
|
return GIT_EINVALID;
|
49
48
|
}
|
50
49
|
|
@@ -59,28 +58,22 @@ int git_buf_try_grow(
|
|
59
58
|
new_ptr = NULL;
|
60
59
|
} else {
|
61
60
|
new_size = buf->asize;
|
62
|
-
/*
|
63
|
-
* Grow the allocated buffer by 1.5 to allow
|
64
|
-
* re-use of memory holes resulting from the
|
65
|
-
* realloc. If this is still too small, then just
|
66
|
-
* use the target size.
|
67
|
-
*/
|
68
|
-
if ((new_size = (new_size << 1) - (new_size >> 1)) < target_size)
|
69
|
-
new_size = target_size;
|
70
61
|
new_ptr = buf->ptr;
|
71
62
|
}
|
72
63
|
|
64
|
+
/* grow the buffer size by 1.5, until it's big enough
|
65
|
+
* to fit our target size */
|
66
|
+
while (new_size < target_size)
|
67
|
+
new_size = (new_size << 1) - (new_size >> 1);
|
68
|
+
|
73
69
|
/* round allocation up to multiple of 8 */
|
74
70
|
new_size = (new_size + 7) & ~7;
|
75
71
|
|
76
72
|
if (new_size < buf->size) {
|
77
|
-
if (mark_oom)
|
78
|
-
if (buf->ptr && buf->ptr != git_buf__initbuf)
|
79
|
-
git__free(buf->ptr);
|
73
|
+
if (mark_oom)
|
80
74
|
buf->ptr = git_buf__oom;
|
81
|
-
}
|
82
75
|
|
83
|
-
|
76
|
+
giterr_set_oom();
|
84
77
|
return -1;
|
85
78
|
}
|
86
79
|
|
@@ -123,7 +116,7 @@ int git_buf_grow_by(git_buf *buffer, size_t additional_size)
|
|
123
116
|
return git_buf_try_grow(buffer, newsize, true);
|
124
117
|
}
|
125
118
|
|
126
|
-
void
|
119
|
+
void git_buf_free(git_buf *buf)
|
127
120
|
{
|
128
121
|
if (!buf) return;
|
129
122
|
|
@@ -133,11 +126,6 @@ void git_buf_dispose(git_buf *buf)
|
|
133
126
|
git_buf_init(buf, 0);
|
134
127
|
}
|
135
128
|
|
136
|
-
void git_buf_free(git_buf *buf)
|
137
|
-
{
|
138
|
-
git_buf_dispose(buf);
|
139
|
-
}
|
140
|
-
|
141
129
|
void git_buf_sanitize(git_buf *buf)
|
142
130
|
{
|
143
131
|
if (buf->ptr == NULL) {
|
@@ -168,7 +156,7 @@ int git_buf_set(git_buf *buf, const void *data, size_t len)
|
|
168
156
|
git_buf_clear(buf);
|
169
157
|
} else {
|
170
158
|
if (data != buf->ptr) {
|
171
|
-
|
159
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
|
172
160
|
ENSURE_SIZE(buf, alloclen);
|
173
161
|
memmove(buf->ptr, data, len);
|
174
162
|
}
|
@@ -199,7 +187,7 @@ int git_buf_sets(git_buf *buf, const char *string)
|
|
199
187
|
int git_buf_putc(git_buf *buf, char c)
|
200
188
|
{
|
201
189
|
size_t new_size;
|
202
|
-
|
190
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, 2);
|
203
191
|
ENSURE_SIZE(buf, new_size);
|
204
192
|
buf->ptr[buf->size++] = c;
|
205
193
|
buf->ptr[buf->size] = '\0';
|
@@ -209,8 +197,8 @@ int git_buf_putc(git_buf *buf, char c)
|
|
209
197
|
int git_buf_putcn(git_buf *buf, char c, size_t len)
|
210
198
|
{
|
211
199
|
size_t new_size;
|
212
|
-
|
213
|
-
|
200
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
|
201
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
214
202
|
ENSURE_SIZE(buf, new_size);
|
215
203
|
memset(buf->ptr + buf->size, c, len);
|
216
204
|
buf->size += len;
|
@@ -225,8 +213,8 @@ int git_buf_put(git_buf *buf, const char *data, size_t len)
|
|
225
213
|
|
226
214
|
assert(data);
|
227
215
|
|
228
|
-
|
229
|
-
|
216
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
|
217
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
230
218
|
ENSURE_SIZE(buf, new_size);
|
231
219
|
memmove(buf->ptr + buf->size, data, len);
|
232
220
|
buf->size += len;
|
@@ -251,9 +239,9 @@ int git_buf_encode_base64(git_buf *buf, const char *data, size_t len)
|
|
251
239
|
const uint8_t *read = (const uint8_t *)data;
|
252
240
|
size_t blocks = (len / 3) + !!extra, alloclen;
|
253
241
|
|
254
|
-
|
255
|
-
|
256
|
-
|
242
|
+
GITERR_CHECK_ALLOC_ADD(&blocks, blocks, 1);
|
243
|
+
GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 4);
|
244
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
|
257
245
|
|
258
246
|
ENSURE_SIZE(buf, alloclen);
|
259
247
|
write = (uint8_t *)&buf->ptr[buf->size];
|
@@ -313,13 +301,13 @@ int git_buf_decode_base64(git_buf *buf, const char *base64, size_t len)
|
|
313
301
|
size_t orig_size = buf->size, new_size;
|
314
302
|
|
315
303
|
if (len % 4) {
|
316
|
-
|
304
|
+
giterr_set(GITERR_INVALID, "invalid base64 input");
|
317
305
|
return -1;
|
318
306
|
}
|
319
307
|
|
320
308
|
assert(len % 4 == 0);
|
321
|
-
|
322
|
-
|
309
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, (len / 4 * 3), buf->size);
|
310
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
323
311
|
ENSURE_SIZE(buf, new_size);
|
324
312
|
|
325
313
|
for (i = 0; i < len; i += 4) {
|
@@ -330,7 +318,7 @@ int git_buf_decode_base64(git_buf *buf, const char *base64, size_t len)
|
|
330
318
|
buf->size = orig_size;
|
331
319
|
buf->ptr[buf->size] = '\0';
|
332
320
|
|
333
|
-
|
321
|
+
giterr_set(GITERR_INVALID, "invalid base64 input");
|
334
322
|
return -1;
|
335
323
|
}
|
336
324
|
|
@@ -350,9 +338,9 @@ int git_buf_encode_base85(git_buf *buf, const char *data, size_t len)
|
|
350
338
|
{
|
351
339
|
size_t blocks = (len / 4) + !!(len % 4), alloclen;
|
352
340
|
|
353
|
-
|
354
|
-
|
355
|
-
|
341
|
+
GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 5);
|
342
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
|
343
|
+
GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
|
356
344
|
|
357
345
|
ENSURE_SIZE(buf, alloclen);
|
358
346
|
|
@@ -415,12 +403,12 @@ int git_buf_decode_base85(
|
|
415
403
|
|
416
404
|
if (base85_len % 5 ||
|
417
405
|
output_len > base85_len * 4 / 5) {
|
418
|
-
|
406
|
+
giterr_set(GITERR_INVALID, "invalid base85 input");
|
419
407
|
return -1;
|
420
408
|
}
|
421
409
|
|
422
|
-
|
423
|
-
|
410
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, output_len, buf->size);
|
411
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
424
412
|
ENSURE_SIZE(buf, new_size);
|
425
413
|
|
426
414
|
while (output_len) {
|
@@ -447,7 +435,7 @@ int git_buf_decode_base85(
|
|
447
435
|
|
448
436
|
acc += de;
|
449
437
|
|
450
|
-
cnt = (output_len < 4) ?
|
438
|
+
cnt = (output_len < 4) ? output_len : 4;
|
451
439
|
output_len -= cnt;
|
452
440
|
do {
|
453
441
|
acc = (acc << 8) | (acc >> 24);
|
@@ -463,7 +451,7 @@ on_error:
|
|
463
451
|
buf->size = orig_size;
|
464
452
|
buf->ptr[buf->size] = '\0';
|
465
453
|
|
466
|
-
|
454
|
+
giterr_set(GITERR_INVALID, "invalid base85 input");
|
467
455
|
return -1;
|
468
456
|
}
|
469
457
|
|
@@ -476,8 +464,8 @@ int git_buf_decode_percent(
|
|
476
464
|
{
|
477
465
|
size_t str_pos, new_size;
|
478
466
|
|
479
|
-
|
480
|
-
|
467
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, str_len);
|
468
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
481
469
|
ENSURE_SIZE(buf, new_size);
|
482
470
|
|
483
471
|
for (str_pos = 0; str_pos < str_len; buf->size++, str_pos++) {
|
@@ -502,8 +490,8 @@ int git_buf_vprintf(git_buf *buf, const char *format, va_list ap)
|
|
502
490
|
size_t expected_size, new_size;
|
503
491
|
int len;
|
504
492
|
|
505
|
-
|
506
|
-
|
493
|
+
GITERR_CHECK_ALLOC_MULTIPLY(&expected_size, strlen(format), 2);
|
494
|
+
GITERR_CHECK_ALLOC_ADD(&expected_size, expected_size, buf->size);
|
507
495
|
ENSURE_SIZE(buf, expected_size);
|
508
496
|
|
509
497
|
while (1) {
|
@@ -529,8 +517,8 @@ int git_buf_vprintf(git_buf *buf, const char *format, va_list ap)
|
|
529
517
|
break;
|
530
518
|
}
|
531
519
|
|
532
|
-
|
533
|
-
|
520
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
|
521
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
|
534
522
|
ENSURE_SIZE(buf, new_size);
|
535
523
|
}
|
536
524
|
|
@@ -622,7 +610,7 @@ char *git_buf_detach(git_buf *buf)
|
|
622
610
|
|
623
611
|
int git_buf_attach(git_buf *buf, char *ptr, size_t asize)
|
624
612
|
{
|
625
|
-
|
613
|
+
git_buf_free(buf);
|
626
614
|
|
627
615
|
if (ptr) {
|
628
616
|
buf->ptr = ptr;
|
@@ -640,7 +628,7 @@ int git_buf_attach(git_buf *buf, char *ptr, size_t asize)
|
|
640
628
|
void git_buf_attach_notowned(git_buf *buf, const char *ptr, size_t size)
|
641
629
|
{
|
642
630
|
if (git_buf_is_allocated(buf))
|
643
|
-
|
631
|
+
git_buf_free(buf);
|
644
632
|
|
645
633
|
if (!size) {
|
646
634
|
git_buf_init(buf, 0);
|
@@ -674,10 +662,10 @@ int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...)
|
|
674
662
|
|
675
663
|
segment_len = strlen(segment);
|
676
664
|
|
677
|
-
|
665
|
+
GITERR_CHECK_ALLOC_ADD(&total_size, total_size, segment_len);
|
678
666
|
|
679
667
|
if (segment_len == 0 || segment[segment_len - 1] != separator)
|
680
|
-
|
668
|
+
GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
|
681
669
|
}
|
682
670
|
va_end(ap);
|
683
671
|
|
@@ -685,7 +673,7 @@ int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...)
|
|
685
673
|
if (total_size == 0)
|
686
674
|
return 0;
|
687
675
|
|
688
|
-
|
676
|
+
GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
|
689
677
|
if (git_buf_grow_by(buf, total_size) < 0)
|
690
678
|
return -1;
|
691
679
|
|
@@ -765,9 +753,9 @@ int git_buf_join(
|
|
765
753
|
if (str_a >= buf->ptr && str_a < buf->ptr + buf->size)
|
766
754
|
offset_a = str_a - buf->ptr;
|
767
755
|
|
768
|
-
|
769
|
-
|
770
|
-
|
756
|
+
GITERR_CHECK_ALLOC_ADD(&alloc_len, strlen_a, strlen_b);
|
757
|
+
GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, need_sep);
|
758
|
+
GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
|
771
759
|
ENSURE_SIZE(buf, alloc_len);
|
772
760
|
|
773
761
|
/* fix up internal pointers */
|
@@ -817,11 +805,11 @@ int git_buf_join3(
|
|
817
805
|
sep_b = (str_b[len_b - 1] != separator);
|
818
806
|
}
|
819
807
|
|
820
|
-
|
821
|
-
|
822
|
-
|
823
|
-
|
824
|
-
|
808
|
+
GITERR_CHECK_ALLOC_ADD(&len_total, len_a, sep_a);
|
809
|
+
GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_b);
|
810
|
+
GITERR_CHECK_ALLOC_ADD(&len_total, len_total, sep_b);
|
811
|
+
GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_c);
|
812
|
+
GITERR_CHECK_ALLOC_ADD(&len_total, len_total, 1);
|
825
813
|
ENSURE_SIZE(buf, len_total);
|
826
814
|
|
827
815
|
tgt = buf->ptr;
|
@@ -884,8 +872,8 @@ int git_buf_splice(
|
|
884
872
|
/* Ported from git.git
|
885
873
|
* https://github.com/git/git/blob/16eed7c/strbuf.c#L159-176
|
886
874
|
*/
|
887
|
-
|
888
|
-
|
875
|
+
GITERR_CHECK_ALLOC_ADD(&new_size, (buf->size - nb_to_remove), nb_to_insert);
|
876
|
+
GITERR_CHECK_ALLOC_ADD(&alloc_size, new_size, 1);
|
889
877
|
ENSURE_SIZE(buf, alloc_size);
|
890
878
|
|
891
879
|
memmove(splice_loc + nb_to_insert,
|
@@ -961,7 +949,7 @@ int git_buf_quote(git_buf *buf)
|
|
961
949
|
git_buf_swap("ed, buf);
|
962
950
|
|
963
951
|
done:
|
964
|
-
|
952
|
+
git_buf_free("ed);
|
965
953
|
return error;
|
966
954
|
}
|
967
955
|
|
@@ -1002,14 +990,14 @@ int git_buf_unquote(git_buf *buf)
|
|
1002
990
|
/* \xyz digits convert to the char*/
|
1003
991
|
case '0': case '1': case '2': case '3':
|
1004
992
|
if (j == buf->size-3) {
|
1005
|
-
|
993
|
+
giterr_set(GITERR_INVALID,
|
1006
994
|
"truncated quoted character \\%c", ch);
|
1007
995
|
return -1;
|
1008
996
|
}
|
1009
997
|
|
1010
998
|
if (buf->ptr[j+1] < '0' || buf->ptr[j+1] > '7' ||
|
1011
999
|
buf->ptr[j+2] < '0' || buf->ptr[j+2] > '7') {
|
1012
|
-
|
1000
|
+
giterr_set(GITERR_INVALID,
|
1013
1001
|
"truncated quoted character \\%c%c%c",
|
1014
1002
|
buf->ptr[j], buf->ptr[j+1], buf->ptr[j+2]);
|
1015
1003
|
return -1;
|
@@ -1022,7 +1010,7 @@ int git_buf_unquote(git_buf *buf)
|
|
1022
1010
|
break;
|
1023
1011
|
|
1024
1012
|
default:
|
1025
|
-
|
1013
|
+
giterr_set(GITERR_INVALID, "invalid quoted character \\%c", ch);
|
1026
1014
|
return -1;
|
1027
1015
|
}
|
1028
1016
|
}
|
@@ -1036,6 +1024,6 @@ int git_buf_unquote(git_buf *buf)
|
|
1036
1024
|
return 0;
|
1037
1025
|
|
1038
1026
|
invalid:
|
1039
|
-
|
1027
|
+
giterr_set(GITERR_INVALID, "invalid quoted line");
|
1040
1028
|
return -1;
|
1041
1029
|
}
|