rugged 1.1.1 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/extconf.rb +2 -2
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_remote.c +17 -0
- data/ext/rugged/rugged_repo.c +3 -3
- data/lib/rugged/repository.rb +2 -2
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -271
- data/vendor/libgit2/COPYING +149 -24
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +13 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -96
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -48
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +32 -20
- data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +154 -122
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +17 -13
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +17 -4
- data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +106 -2
- data/vendor/libgit2/include/git2/blame.h +97 -43
- data/vendor/libgit2/include/git2/blob.h +33 -2
- data/vendor/libgit2/include/git2/branch.h +27 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +43 -6
- data/vendor/libgit2/include/git2/checkout.h +32 -13
- data/vendor/libgit2/include/git2/clone.h +4 -4
- data/vendor/libgit2/include/git2/commit.h +37 -19
- data/vendor/libgit2/include/git2/common.h +46 -5
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +326 -6
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +50 -121
- data/vendor/libgit2/include/git2/email.h +127 -0
- data/vendor/libgit2/include/git2/errors.h +7 -6
- data/vendor/libgit2/include/git2/filter.h +69 -18
- data/vendor/libgit2/include/git2/graph.h +21 -2
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +13 -7
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/notes.h +2 -2
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +65 -6
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/oidarray.h +5 -8
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +16 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +34 -2
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +8 -4
- data/vendor/libgit2/include/git2/remote.h +246 -46
- data/vendor/libgit2/include/git2/repository.h +25 -18
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +124 -62
- data/vendor/libgit2/include/git2/stdint.h +3 -3
- data/vendor/libgit2/include/git2/submodule.h +16 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/email.h +45 -0
- data/vendor/libgit2/include/git2/sys/filter.h +49 -28
- data/vendor/libgit2/include/git2/sys/midx.h +74 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +9 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +26 -34
- data/vendor/libgit2/include/git2/tag.h +13 -0
- data/vendor/libgit2/include/git2/tree.h +4 -17
- data/vendor/libgit2/include/git2/types.h +16 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +192 -290
- data/vendor/libgit2/src/alloc.c +21 -8
- data/vendor/libgit2/src/allocators/failalloc.c +92 -0
- data/vendor/libgit2/src/allocators/failalloc.h +23 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
- data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
- data/vendor/libgit2/src/annotated_commit.c +21 -9
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +34 -25
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +204 -82
- data/vendor/libgit2/src/attr_file.c +105 -52
- data/vendor/libgit2/src/attr_file.h +36 -15
- data/vendor/libgit2/src/attrcache.c +55 -45
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +15 -9
- data/vendor/libgit2/src/blame_git.c +2 -2
- data/vendor/libgit2/src/blob.c +76 -52
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +203 -110
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +11 -9
- data/vendor/libgit2/src/checkout.c +118 -91
- data/vendor/libgit2/src/cherrypick.c +16 -12
- data/vendor/libgit2/src/clone.c +97 -103
- data/vendor/libgit2/src/commit.c +167 -84
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +1224 -0
- data/vendor/libgit2/src/commit_graph.h +169 -0
- data/vendor/libgit2/src/commit_list.c +48 -3
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +35 -5
- data/vendor/libgit2/src/config.c +119 -64
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +120 -100
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +29 -27
- data/vendor/libgit2/src/crlf.c +36 -23
- data/vendor/libgit2/src/date.c +13 -19
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +32 -21
- data/vendor/libgit2/src/diff.c +71 -183
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +53 -51
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +31 -26
- data/vendor/libgit2/src/diff_generate.c +76 -23
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +120 -95
- data/vendor/libgit2/src/diff_stats.c +47 -34
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +7 -10
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/email.c +315 -0
- data/vendor/libgit2/src/email.h +25 -0
- data/vendor/libgit2/src/errors.c +37 -32
- data/vendor/libgit2/src/features.h.in +11 -2
- data/vendor/libgit2/src/fetch.c +77 -26
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +27 -23
- data/vendor/libgit2/src/filebuf.c +36 -34
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +278 -132
- data/vendor/libgit2/src/filter.h +46 -6
- data/vendor/libgit2/src/fs_path.c +2071 -0
- data/vendor/libgit2/src/fs_path.h +772 -0
- data/vendor/libgit2/src/futils.c +96 -90
- data/vendor/libgit2/src/futils.h +27 -15
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +5 -5
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +5 -5
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +13 -13
- data/vendor/libgit2/src/hash/sha1/openssl.c +5 -5
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +9 -11
- data/vendor/libgit2/src/hash/sha1/win32.c +21 -17
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +71 -36
- data/vendor/libgit2/src/hash.h +13 -13
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +30 -20
- data/vendor/libgit2/src/ignore.c +63 -46
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +184 -149
- data/vendor/libgit2/src/index.h +7 -4
- data/vendor/libgit2/src/indexer.c +143 -89
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +93 -73
- data/vendor/libgit2/src/iterator.h +6 -6
- data/vendor/libgit2/src/khash.h +3 -12
- data/vendor/libgit2/src/{settings.c → libgit2.c} +165 -56
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +60 -45
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +104 -61
- data/vendor/libgit2/src/merge.h +3 -15
- data/vendor/libgit2/src/merge_driver.c +21 -15
- data/vendor/libgit2/src/merge_file.c +24 -6
- data/vendor/libgit2/src/message.c +21 -8
- data/vendor/libgit2/src/midx.c +501 -18
- data/vendor/libgit2/src/midx.h +29 -2
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +405 -71
- data/vendor/libgit2/src/net.h +26 -5
- data/vendor/libgit2/src/netops.c +7 -5
- data/vendor/libgit2/src/netops.h +3 -3
- data/vendor/libgit2/src/notes.c +40 -49
- data/vendor/libgit2/src/object.c +68 -20
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +320 -80
- data/vendor/libgit2/src/odb.h +17 -3
- data/vendor/libgit2/src/odb_loose.c +96 -86
- data/vendor/libgit2/src/odb_mempack.c +19 -6
- data/vendor/libgit2/src/odb_pack.c +402 -125
- data/vendor/libgit2/src/oid.c +16 -8
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/oidarray.c +10 -1
- data/vendor/libgit2/src/pack-objects.c +90 -69
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +337 -127
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +17 -10
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +29 -13
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +26 -25
- data/vendor/libgit2/src/path.c +86 -1768
- data/vendor/libgit2/src/path.h +39 -635
- data/vendor/libgit2/src/pathspec.c +12 -12
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +14 -6
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +18 -14
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +177 -132
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +548 -222
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +107 -72
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +53 -38
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +960 -486
- data/vendor/libgit2/src/remote.h +16 -10
- data/vendor/libgit2/src/repository.c +702 -422
- data/vendor/libgit2/src/repository.h +26 -8
- data/vendor/libgit2/src/reset.c +16 -12
- data/vendor/libgit2/src/revert.c +16 -12
- data/vendor/libgit2/src/revparse.c +66 -48
- data/vendor/libgit2/src/revwalk.c +39 -22
- data/vendor/libgit2/src/runtime.c +162 -0
- data/vendor/libgit2/src/runtime.h +62 -0
- data/vendor/libgit2/src/settings.h +11 -0
- data/vendor/libgit2/src/signature.c +18 -11
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +39 -38
- data/vendor/libgit2/src/status.c +11 -5
- data/vendor/libgit2/src/{buffer.c → str.c} +459 -136
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +22 -23
- data/vendor/libgit2/src/streams/mbedtls.h +1 -1
- data/vendor/libgit2/src/streams/openssl.c +101 -201
- data/vendor/libgit2/src/streams/openssl.h +9 -1
- data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
- data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
- data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
- data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
- data/vendor/libgit2/src/streams/registry.c +5 -6
- data/vendor/libgit2/src/streams/socket.c +6 -2
- data/vendor/libgit2/src/streams/stransport.c +6 -3
- data/vendor/libgit2/src/streams/tls.c +5 -3
- data/vendor/libgit2/src/submodule.c +290 -212
- data/vendor/libgit2/src/submodule.h +10 -10
- data/vendor/libgit2/src/sysdir.c +70 -56
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +72 -34
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +84 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +3 -16
- data/vendor/libgit2/src/trace.h +17 -30
- data/vendor/libgit2/src/trailer.c +2 -2
- data/vendor/libgit2/src/transaction.c +20 -9
- data/vendor/libgit2/src/transport.c +13 -13
- data/vendor/libgit2/src/transports/auth.c +8 -10
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +23 -17
- data/vendor/libgit2/src/transports/auth_ntlm.c +20 -16
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +10 -14
- data/vendor/libgit2/src/transports/http.c +56 -34
- data/vendor/libgit2/src/transports/http.h +3 -3
- data/vendor/libgit2/src/transports/httpclient.c +106 -79
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +127 -119
- data/vendor/libgit2/src/transports/smart.c +61 -144
- data/vendor/libgit2/src/transports/smart.h +26 -32
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +68 -44
- data/vendor/libgit2/src/transports/ssh.c +100 -131
- data/vendor/libgit2/src/transports/winhttp.c +86 -82
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +150 -116
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +68 -144
- data/vendor/libgit2/src/util.h +36 -68
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +5 -3
- data/vendor/libgit2/src/win32/findfile.c +172 -114
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/map.c +1 -1
- data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
- data/vendor/libgit2/src/win32/path_w32.c +162 -33
- data/vendor/libgit2/src/win32/path_w32.h +2 -1
- data/vendor/libgit2/src/win32/posix.h +6 -7
- data/vendor/libgit2/src/win32/posix_w32.c +26 -33
- data/vendor/libgit2/src/win32/precompiled.h +0 -1
- data/vendor/libgit2/src/win32/reparse.h +4 -4
- data/vendor/libgit2/src/win32/thread.c +24 -15
- data/vendor/libgit2/src/win32/thread.h +1 -1
- data/vendor/libgit2/src/win32/w32_buffer.c +5 -6
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_common.h +18 -9
- data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
- data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -6
- data/vendor/libgit2/src/worktree.c +138 -105
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +6 -6
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +60 -24
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/buf_text.c +0 -316
- data/vendor/libgit2/src/buf_text.h +0 -122
- data/vendor/libgit2/src/buffer.h +0 -222
- data/vendor/libgit2/src/global.c +0 -363
- data/vendor/libgit2/src/global.h +0 -41
- data/vendor/libgit2/src/thread-utils.c +0 -58
- data/vendor/libgit2/src/thread-utils.h +0 -369
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
- data/vendor/libgit2/src/win32/w32_stack.c +0 -188
- data/vendor/libgit2/src/win32/w32_stack.h +0 -140
@@ -43,10 +43,10 @@ GIT_INLINE(int) git__is_ulong(int64_t p)
|
|
43
43
|
}
|
44
44
|
|
45
45
|
/** @return true if p fits into the range of an int */
|
46
|
-
GIT_INLINE(int) git__is_int(
|
46
|
+
GIT_INLINE(int) git__is_int(int64_t p)
|
47
47
|
{
|
48
48
|
int r = (int)p;
|
49
|
-
return p == (
|
49
|
+
return p == (int64_t)r;
|
50
50
|
}
|
51
51
|
|
52
52
|
/* Use clang/gcc compiler intrinsics whenever possible */
|
@@ -80,6 +80,12 @@ GIT_INLINE(int) git__is_int(long long p)
|
|
80
80
|
# define git__add_int64_overflow(out, one, two) \
|
81
81
|
__builtin_add_overflow(one, two, out)
|
82
82
|
|
83
|
+
/* clang on 32-bit systems produces an undefined reference to `__mulodi4`. */
|
84
|
+
# if !defined(__clang__) || !defined(GIT_ARCH_32)
|
85
|
+
# define git__multiply_int64_overflow(out, one, two) \
|
86
|
+
__builtin_mul_overflow(one, two, out)
|
87
|
+
# endif
|
88
|
+
|
83
89
|
/* Use Microsoft's safe integer handling functions where available */
|
84
90
|
#elif defined(_MSC_VER)
|
85
91
|
|
@@ -90,6 +96,7 @@ GIT_INLINE(int) git__is_int(long long p)
|
|
90
96
|
(SizeTAdd(one, two, out) != S_OK)
|
91
97
|
# define git__multiply_sizet_overflow(out, one, two) \
|
92
98
|
(SizeTMult(one, two, out) != S_OK)
|
99
|
+
|
93
100
|
#define git__add_int_overflow(out, one, two) \
|
94
101
|
(IntAdd(one, two, out) != S_OK)
|
95
102
|
#define git__sub_int_overflow(out, one, two) \
|
@@ -97,6 +104,8 @@ GIT_INLINE(int) git__is_int(long long p)
|
|
97
104
|
|
98
105
|
#define git__add_int64_overflow(out, one, two) \
|
99
106
|
(LongLongAdd(one, two, out) != S_OK)
|
107
|
+
#define git__multiply_int64_overflow(out, one, two) \
|
108
|
+
(LongLongMult(one, two, out) != S_OK)
|
100
109
|
|
101
110
|
#else
|
102
111
|
|
@@ -153,4 +162,57 @@ GIT_INLINE(bool) git__add_int64_overflow(int64_t *out, int64_t one, int64_t two)
|
|
153
162
|
|
154
163
|
#endif
|
155
164
|
|
165
|
+
/* If we could not provide an intrinsic implementation for this, provide a (slow) fallback. */
|
166
|
+
#if !defined(git__multiply_int64_overflow)
|
167
|
+
GIT_INLINE(bool) git__multiply_int64_overflow(int64_t *out, int64_t one, int64_t two)
|
168
|
+
{
|
169
|
+
/*
|
170
|
+
* Detects whether `INT64_MAX < (one * two) || INT64_MIN > (one * two)`,
|
171
|
+
* without incurring in undefined behavior. That is done by performing the
|
172
|
+
* comparison with a division instead of a multiplication, which translates
|
173
|
+
* to `INT64_MAX / one < two || INT64_MIN / one > two`. Some caveats:
|
174
|
+
*
|
175
|
+
* - The comparison sign is inverted when both sides of the inequality are
|
176
|
+
* multiplied/divided by a negative number, so if `one < 0` the comparison
|
177
|
+
* needs to be flipped.
|
178
|
+
* - `INT64_MAX / -1` itself overflows (or traps), so that case should be
|
179
|
+
* avoided.
|
180
|
+
* - Since the overflow flag is defined as the discrepance between the result
|
181
|
+
* of performing the multiplication in a signed integer at twice the width
|
182
|
+
* of the operands, and the truncated+sign-extended version of that same
|
183
|
+
* result, there are four cases where the result is the opposite of what
|
184
|
+
* would be expected:
|
185
|
+
* * `INT64_MIN * -1` / `-1 * INT64_MIN`
|
186
|
+
* * `INT64_MIN * 1 / `1 * INT64_MIN`
|
187
|
+
*/
|
188
|
+
if (one && two) {
|
189
|
+
if (one > 0 && two > 0) {
|
190
|
+
if (INT64_MAX / one < two)
|
191
|
+
return true;
|
192
|
+
} else if (one < 0 && two < 0) {
|
193
|
+
if ((one == -1 && two == INT64_MIN) ||
|
194
|
+
(two == -1 && one == INT64_MIN)) {
|
195
|
+
*out = INT64_MIN;
|
196
|
+
return false;
|
197
|
+
}
|
198
|
+
if (INT64_MAX / one > two)
|
199
|
+
return true;
|
200
|
+
} else if (one > 0 && two < 0) {
|
201
|
+
if ((one == 1 && two == INT64_MIN) ||
|
202
|
+
(INT64_MIN / one > two))
|
203
|
+
return true;
|
204
|
+
} else if (one == -1) {
|
205
|
+
if (INT64_MIN / two > one)
|
206
|
+
return true;
|
207
|
+
} else {
|
208
|
+
if ((one == INT64_MIN && two == 1) ||
|
209
|
+
(INT64_MIN / one < two))
|
210
|
+
return true;
|
211
|
+
}
|
212
|
+
}
|
213
|
+
*out = one * two;
|
214
|
+
return false;
|
215
|
+
}
|
216
|
+
#endif
|
217
|
+
|
156
218
|
#endif
|
@@ -9,6 +9,7 @@
|
|
9
9
|
|
10
10
|
#include "tree.h"
|
11
11
|
#include "index.h"
|
12
|
+
#include "path.h"
|
12
13
|
|
13
14
|
#define GIT_ITERATOR_FIRST_ACCESS (1 << 15)
|
14
15
|
#define GIT_ITERATOR_HONOR_IGNORES (1 << 16)
|
@@ -292,7 +293,7 @@ typedef enum {
|
|
292
293
|
ITERATOR_PATHLIST_IS_FILE = 1,
|
293
294
|
ITERATOR_PATHLIST_IS_DIR = 2,
|
294
295
|
ITERATOR_PATHLIST_IS_PARENT = 3,
|
295
|
-
ITERATOR_PATHLIST_FULL = 4
|
296
|
+
ITERATOR_PATHLIST_FULL = 4
|
296
297
|
} iterator_pathlist_search_t;
|
297
298
|
|
298
299
|
static iterator_pathlist_search_t iterator_pathlist_search(
|
@@ -330,7 +331,7 @@ static iterator_pathlist_search_t iterator_pathlist_search(
|
|
330
331
|
break;
|
331
332
|
|
332
333
|
/* an exact match would have been matched by the bsearch above */
|
333
|
-
|
334
|
+
GIT_ASSERT_WITH_RETVAL(p[path_len], ITERATOR_PATHLIST_NONE);
|
334
335
|
|
335
336
|
/* is this a literal directory entry (eg `foo/`) or a file beneath */
|
336
337
|
if (p[path_len] == '/') {
|
@@ -424,7 +425,7 @@ typedef struct {
|
|
424
425
|
git_tree *tree;
|
425
426
|
|
426
427
|
/* path to this particular frame (folder) */
|
427
|
-
|
428
|
+
git_str path;
|
428
429
|
|
429
430
|
/* a sorted list of the entries for this frame (folder), these are
|
430
431
|
* actually pointers to the iterator's entry pool.
|
@@ -441,7 +442,7 @@ typedef struct {
|
|
441
442
|
* parent path.
|
442
443
|
*/
|
443
444
|
git_vector similar_trees;
|
444
|
-
git_array_t(
|
445
|
+
git_array_t(git_str) similar_paths;
|
445
446
|
} tree_iterator_frame;
|
446
447
|
|
447
448
|
typedef struct {
|
@@ -450,7 +451,7 @@ typedef struct {
|
|
450
451
|
git_array_t(tree_iterator_frame) frames;
|
451
452
|
|
452
453
|
git_index_entry entry;
|
453
|
-
|
454
|
+
git_str entry_path;
|
454
455
|
|
455
456
|
/* a pool of entries to reduce the number of allocations */
|
456
457
|
git_pool entry_pool;
|
@@ -472,7 +473,7 @@ GIT_INLINE(tree_iterator_frame *) tree_iterator_current_frame(
|
|
472
473
|
GIT_INLINE(int) tree_entry_cmp(
|
473
474
|
const git_tree_entry *a, const git_tree_entry *b, bool icase)
|
474
475
|
{
|
475
|
-
return
|
476
|
+
return git_fs_path_cmp(
|
476
477
|
a->filename, a->filename_len, a->attr == GIT_FILEMODE_TREE,
|
477
478
|
b->filename, b->filename_len, b->attr == GIT_FILEMODE_TREE,
|
478
479
|
icase ? git__strncasecmp : git__strncmp);
|
@@ -508,20 +509,20 @@ static int tree_iterator_entry_sort_icase(const void *ptr_a, const void *ptr_b)
|
|
508
509
|
}
|
509
510
|
|
510
511
|
static int tree_iterator_compute_path(
|
511
|
-
|
512
|
+
git_str *out,
|
512
513
|
tree_iterator_entry *entry)
|
513
514
|
{
|
514
|
-
|
515
|
+
git_str_clear(out);
|
515
516
|
|
516
517
|
if (entry->parent_path)
|
517
|
-
|
518
|
+
git_str_joinpath(out, entry->parent_path, entry->tree_entry->filename);
|
518
519
|
else
|
519
|
-
|
520
|
+
git_str_puts(out, entry->tree_entry->filename);
|
520
521
|
|
521
522
|
if (git_tree_entry__is_tree(entry->tree_entry))
|
522
|
-
|
523
|
+
git_str_putc(out, '/');
|
523
524
|
|
524
|
-
if (
|
525
|
+
if (git_str_oom(out))
|
525
526
|
return -1;
|
526
527
|
|
527
528
|
return 0;
|
@@ -601,7 +602,7 @@ GIT_INLINE(int) tree_iterator_frame_push_neighbors(
|
|
601
602
|
tree_iterator_entry *entry, *new_entry;
|
602
603
|
git_tree *tree = NULL;
|
603
604
|
git_tree_entry *tree_entry;
|
604
|
-
|
605
|
+
git_str *path;
|
605
606
|
size_t new_size, i;
|
606
607
|
int error = 0;
|
607
608
|
|
@@ -621,7 +622,7 @@ GIT_INLINE(int) tree_iterator_frame_push_neighbors(
|
|
621
622
|
path = git_array_alloc(parent_frame->similar_paths);
|
622
623
|
GIT_ERROR_CHECK_ALLOC(path);
|
623
624
|
|
624
|
-
memset(path, 0, sizeof(
|
625
|
+
memset(path, 0, sizeof(git_str));
|
625
626
|
|
626
627
|
if ((error = tree_iterator_compute_path(path, entry)) < 0)
|
627
628
|
break;
|
@@ -678,14 +679,14 @@ done:
|
|
678
679
|
return error;
|
679
680
|
}
|
680
681
|
|
681
|
-
static
|
682
|
+
static int tree_iterator_frame_pop(tree_iterator *iter)
|
682
683
|
{
|
683
684
|
tree_iterator_frame *frame;
|
684
|
-
|
685
|
+
git_str *buf = NULL;
|
685
686
|
git_tree *tree;
|
686
687
|
size_t i;
|
687
688
|
|
688
|
-
|
689
|
+
GIT_ASSERT(iter->frames.size);
|
689
690
|
|
690
691
|
frame = git_array_pop(iter->frames);
|
691
692
|
|
@@ -694,7 +695,7 @@ static void tree_iterator_frame_pop(tree_iterator *iter)
|
|
694
695
|
|
695
696
|
do {
|
696
697
|
buf = git_array_pop(frame->similar_paths);
|
697
|
-
|
698
|
+
git_str_dispose(buf);
|
698
699
|
} while (buf != NULL);
|
699
700
|
|
700
701
|
git_array_clear(frame->similar_paths);
|
@@ -704,7 +705,9 @@ static void tree_iterator_frame_pop(tree_iterator *iter)
|
|
704
705
|
|
705
706
|
git_vector_free(&frame->similar_trees);
|
706
707
|
|
707
|
-
|
708
|
+
git_str_dispose(&frame->path);
|
709
|
+
|
710
|
+
return 0;
|
708
711
|
}
|
709
712
|
|
710
713
|
static int tree_iterator_current(
|
@@ -760,7 +763,9 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
|
|
760
763
|
|
761
764
|
/* no more entries in this frame. pop the frame out */
|
762
765
|
if (frame->next_idx == frame->entries.length) {
|
763
|
-
tree_iterator_frame_pop(iter)
|
766
|
+
if ((error = tree_iterator_frame_pop(iter)) < 0)
|
767
|
+
break;
|
768
|
+
|
764
769
|
continue;
|
765
770
|
}
|
766
771
|
|
@@ -838,7 +843,7 @@ static int tree_iterator_advance_into(
|
|
838
843
|
const git_index_entry **out, git_iterator *i)
|
839
844
|
{
|
840
845
|
tree_iterator *iter = (tree_iterator *)i;
|
841
|
-
|
846
|
+
tree_iterator_frame *frame;
|
842
847
|
tree_iterator_entry *prev_entry;
|
843
848
|
int error;
|
844
849
|
|
@@ -855,7 +860,7 @@ static int tree_iterator_advance_into(
|
|
855
860
|
* we will have pushed a new (empty) frame on to the stack for this
|
856
861
|
* new directory. since it's empty, its current_entry should be null.
|
857
862
|
*/
|
858
|
-
|
863
|
+
GIT_ASSERT(iterator__do_autoexpand(i) ^ (prev_entry != NULL));
|
859
864
|
|
860
865
|
if (prev_entry) {
|
861
866
|
if (!git_tree_entry__is_tree(prev_entry->tree_entry))
|
@@ -888,7 +893,7 @@ static void tree_iterator_clear(tree_iterator *iter)
|
|
888
893
|
git_array_clear(iter->frames);
|
889
894
|
|
890
895
|
git_pool_clear(&iter->entry_pool);
|
891
|
-
|
896
|
+
git_str_clear(&iter->entry_path);
|
892
897
|
|
893
898
|
iterator_clear(&iter->base);
|
894
899
|
}
|
@@ -921,7 +926,7 @@ static void tree_iterator_free(git_iterator *i)
|
|
921
926
|
tree_iterator_clear(iter);
|
922
927
|
|
923
928
|
git_tree_free(iter->root);
|
924
|
-
|
929
|
+
git_str_dispose(&iter->entry_path);
|
925
930
|
}
|
926
931
|
|
927
932
|
int git_iterator_for_tree(
|
@@ -973,7 +978,7 @@ int git_iterator_current_tree_entry(
|
|
973
978
|
tree_iterator_frame *frame;
|
974
979
|
tree_iterator_entry *entry;
|
975
980
|
|
976
|
-
|
981
|
+
GIT_ASSERT(i->type == GIT_ITERATOR_TREE);
|
977
982
|
|
978
983
|
iter = (tree_iterator *)i;
|
979
984
|
|
@@ -990,11 +995,11 @@ int git_iterator_current_parent_tree(
|
|
990
995
|
tree_iterator *iter;
|
991
996
|
tree_iterator_frame *frame;
|
992
997
|
|
993
|
-
|
998
|
+
GIT_ASSERT(i->type == GIT_ITERATOR_TREE);
|
994
999
|
|
995
1000
|
iter = (tree_iterator *)i;
|
996
1001
|
|
997
|
-
|
1002
|
+
GIT_ASSERT(depth < iter->frames.size);
|
998
1003
|
frame = &iter->frames.ptr[iter->frames.size-depth-1];
|
999
1004
|
|
1000
1005
|
*parent_tree = frame->tree;
|
@@ -1036,11 +1041,11 @@ typedef struct {
|
|
1036
1041
|
|
1037
1042
|
/* info about the current entry */
|
1038
1043
|
git_index_entry entry;
|
1039
|
-
|
1044
|
+
git_str current_path;
|
1040
1045
|
int current_is_ignored;
|
1041
1046
|
|
1042
1047
|
/* temporary buffer for advance_over */
|
1043
|
-
|
1048
|
+
git_str tmp_buf;
|
1044
1049
|
} filesystem_iterator;
|
1045
1050
|
|
1046
1051
|
|
@@ -1262,7 +1267,7 @@ static int filesystem_iterator_entry_hash(
|
|
1262
1267
|
filesystem_iterator *iter,
|
1263
1268
|
filesystem_iterator_entry *entry)
|
1264
1269
|
{
|
1265
|
-
|
1270
|
+
git_str fullpath = GIT_STR_INIT;
|
1266
1271
|
int error;
|
1267
1272
|
|
1268
1273
|
if (S_ISDIR(entry->st.st_mode)) {
|
@@ -1274,10 +1279,11 @@ static int filesystem_iterator_entry_hash(
|
|
1274
1279
|
return git_repository_hashfile(&entry->id,
|
1275
1280
|
iter->base.repo, entry->path, GIT_OBJECT_BLOB, NULL);
|
1276
1281
|
|
1277
|
-
if (!(error =
|
1282
|
+
if (!(error = git_str_joinpath(&fullpath, iter->root, entry->path)) &&
|
1283
|
+
!(error = git_path_validate_str_length(iter->base.repo, &fullpath)))
|
1278
1284
|
error = git_odb_hashfile(&entry->id, fullpath.ptr, GIT_OBJECT_BLOB);
|
1279
1285
|
|
1280
|
-
|
1286
|
+
git_str_dispose(&fullpath);
|
1281
1287
|
return error;
|
1282
1288
|
}
|
1283
1289
|
|
@@ -1331,8 +1337,8 @@ static int filesystem_iterator_frame_push(
|
|
1331
1337
|
filesystem_iterator_entry *frame_entry)
|
1332
1338
|
{
|
1333
1339
|
filesystem_iterator_frame *new_frame = NULL;
|
1334
|
-
|
1335
|
-
|
1340
|
+
git_fs_path_diriter diriter = GIT_FS_PATH_DIRITER_INIT;
|
1341
|
+
git_str root = GIT_STR_INIT;
|
1336
1342
|
const char *path;
|
1337
1343
|
filesystem_iterator_entry *entry;
|
1338
1344
|
struct stat statbuf;
|
@@ -1351,11 +1357,12 @@ static int filesystem_iterator_frame_push(
|
|
1351
1357
|
memset(new_frame, 0, sizeof(filesystem_iterator_frame));
|
1352
1358
|
|
1353
1359
|
if (frame_entry)
|
1354
|
-
|
1360
|
+
git_str_joinpath(&root, iter->root, frame_entry->path);
|
1355
1361
|
else
|
1356
|
-
|
1362
|
+
git_str_puts(&root, iter->root);
|
1357
1363
|
|
1358
|
-
if (
|
1364
|
+
if (git_str_oom(&root) ||
|
1365
|
+
git_path_validate_str_length(iter->base.repo, &root) < 0) {
|
1359
1366
|
error = -1;
|
1360
1367
|
goto done;
|
1361
1368
|
}
|
@@ -1363,7 +1370,7 @@ static int filesystem_iterator_frame_push(
|
|
1363
1370
|
new_frame->path_len = frame_entry ? frame_entry->path_len : 0;
|
1364
1371
|
|
1365
1372
|
/* Any error here is equivalent to the dir not existing, skip over it */
|
1366
|
-
if ((error =
|
1373
|
+
if ((error = git_fs_path_diriter_init(
|
1367
1374
|
&diriter, root.ptr, iter->dirload_flags)) < 0) {
|
1368
1375
|
error = GIT_ENOTFOUND;
|
1369
1376
|
goto done;
|
@@ -1381,14 +1388,21 @@ static int filesystem_iterator_frame_push(
|
|
1381
1388
|
/* check if this directory is ignored */
|
1382
1389
|
filesystem_iterator_frame_push_ignores(iter, frame_entry, new_frame);
|
1383
1390
|
|
1384
|
-
while ((error =
|
1391
|
+
while ((error = git_fs_path_diriter_next(&diriter)) == 0) {
|
1385
1392
|
iterator_pathlist_search_t pathlist_match = ITERATOR_PATHLIST_FULL;
|
1393
|
+
git_str path_str = GIT_STR_INIT;
|
1386
1394
|
bool dir_expected = false;
|
1387
1395
|
|
1388
|
-
if ((error =
|
1396
|
+
if ((error = git_fs_path_diriter_fullpath(&path, &path_len, &diriter)) < 0)
|
1397
|
+
goto done;
|
1398
|
+
|
1399
|
+
path_str.ptr = (char *)path;
|
1400
|
+
path_str.size = path_len;
|
1401
|
+
|
1402
|
+
if ((error = git_path_validate_str_length(iter->base.repo, &path_str)) < 0)
|
1389
1403
|
goto done;
|
1390
1404
|
|
1391
|
-
|
1405
|
+
GIT_ASSERT(path_len > iter->root_len);
|
1392
1406
|
|
1393
1407
|
/* remove the prefix if requested */
|
1394
1408
|
path += iter->root_len;
|
@@ -1407,7 +1421,7 @@ static int filesystem_iterator_frame_push(
|
|
1407
1421
|
* we have an index, we can just copy the data out of it.
|
1408
1422
|
*/
|
1409
1423
|
|
1410
|
-
if ((error =
|
1424
|
+
if ((error = git_fs_path_diriter_stat(&statbuf, &diriter)) < 0) {
|
1411
1425
|
/* file was removed between readdir and lstat */
|
1412
1426
|
if (error == GIT_ENOTFOUND)
|
1413
1427
|
continue;
|
@@ -1464,22 +1478,24 @@ done:
|
|
1464
1478
|
if (error < 0)
|
1465
1479
|
git_array_pop(iter->frames);
|
1466
1480
|
|
1467
|
-
|
1468
|
-
|
1481
|
+
git_str_dispose(&root);
|
1482
|
+
git_fs_path_diriter_free(&diriter);
|
1469
1483
|
return error;
|
1470
1484
|
}
|
1471
1485
|
|
1472
|
-
GIT_INLINE(
|
1486
|
+
GIT_INLINE(int) filesystem_iterator_frame_pop(filesystem_iterator *iter)
|
1473
1487
|
{
|
1474
1488
|
filesystem_iterator_frame *frame;
|
1475
1489
|
|
1476
|
-
|
1490
|
+
GIT_ASSERT(iter->frames.size);
|
1477
1491
|
|
1478
1492
|
frame = git_array_pop(iter->frames);
|
1479
1493
|
filesystem_iterator_frame_pop_ignores(iter);
|
1480
1494
|
|
1481
1495
|
git_pool_clear(&frame->entry_pool);
|
1482
1496
|
git_vector_free(&frame->entries);
|
1497
|
+
|
1498
|
+
return 0;
|
1483
1499
|
}
|
1484
1500
|
|
1485
1501
|
static void filesystem_iterator_set_current(
|
@@ -1542,7 +1558,7 @@ static int filesystem_iterator_is_dir(
|
|
1542
1558
|
const filesystem_iterator_entry *entry)
|
1543
1559
|
{
|
1544
1560
|
struct stat st;
|
1545
|
-
|
1561
|
+
git_str fullpath = GIT_STR_INIT;
|
1546
1562
|
int error = 0;
|
1547
1563
|
|
1548
1564
|
if (S_ISDIR(entry->st.st_mode)) {
|
@@ -1555,14 +1571,15 @@ static int filesystem_iterator_is_dir(
|
|
1555
1571
|
goto done;
|
1556
1572
|
}
|
1557
1573
|
|
1558
|
-
if ((error =
|
1559
|
-
|
1574
|
+
if ((error = git_str_joinpath(&fullpath, iter->root, entry->path)) < 0 ||
|
1575
|
+
(error = git_path_validate_str_length(iter->base.repo, &fullpath)) < 0 ||
|
1576
|
+
(error = p_stat(fullpath.ptr, &st)) < 0)
|
1560
1577
|
goto done;
|
1561
1578
|
|
1562
1579
|
*is_dir = S_ISDIR(st.st_mode);
|
1563
1580
|
|
1564
1581
|
done:
|
1565
|
-
|
1582
|
+
git_str_dispose(&fullpath);
|
1566
1583
|
return error;
|
1567
1584
|
}
|
1568
1585
|
|
@@ -1646,7 +1663,7 @@ static int filesystem_iterator_advance_into(
|
|
1646
1663
|
* we will have pushed a new (empty) frame on to the stack for this
|
1647
1664
|
* new directory. since it's empty, its current_entry should be null.
|
1648
1665
|
*/
|
1649
|
-
|
1666
|
+
GIT_ASSERT(iterator__do_autoexpand(i) ^ (prev_entry != NULL));
|
1650
1667
|
|
1651
1668
|
if (prev_entry) {
|
1652
1669
|
if (prev_entry->st.st_mode != GIT_FILEMODE_COMMIT &&
|
@@ -1663,7 +1680,7 @@ static int filesystem_iterator_advance_into(
|
|
1663
1680
|
return filesystem_iterator_advance(out, i);
|
1664
1681
|
}
|
1665
1682
|
|
1666
|
-
int git_iterator_current_workdir_path(
|
1683
|
+
int git_iterator_current_workdir_path(git_str **out, git_iterator *i)
|
1667
1684
|
{
|
1668
1685
|
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1669
1686
|
const git_index_entry *entry;
|
@@ -1674,10 +1691,10 @@ int git_iterator_current_workdir_path(git_buf **out, git_iterator *i)
|
|
1674
1691
|
return 0;
|
1675
1692
|
}
|
1676
1693
|
|
1677
|
-
|
1694
|
+
git_str_truncate(&iter->current_path, iter->root_len);
|
1678
1695
|
|
1679
1696
|
if (git_iterator_current(&entry, i) < 0 ||
|
1680
|
-
|
1697
|
+
git_str_puts(&iter->current_path, entry->path) < 0)
|
1681
1698
|
return -1;
|
1682
1699
|
|
1683
1700
|
*out = &iter->current_path;
|
@@ -1762,12 +1779,13 @@ static int filesystem_iterator_advance_over(
|
|
1762
1779
|
*out = NULL;
|
1763
1780
|
*status = GIT_ITERATOR_STATUS_NORMAL;
|
1764
1781
|
|
1765
|
-
|
1782
|
+
GIT_ASSERT(iterator__has_been_accessed(i));
|
1766
1783
|
|
1767
1784
|
current_frame = filesystem_iterator_current_frame(iter);
|
1768
|
-
|
1785
|
+
GIT_ASSERT(current_frame);
|
1786
|
+
|
1769
1787
|
current_entry = filesystem_iterator_current_entry(current_frame);
|
1770
|
-
|
1788
|
+
GIT_ASSERT(current_entry);
|
1771
1789
|
|
1772
1790
|
if ((error = git_iterator_current(&entry, i)) < 0)
|
1773
1791
|
return error;
|
@@ -1779,8 +1797,8 @@ static int filesystem_iterator_advance_over(
|
|
1779
1797
|
return filesystem_iterator_advance(out, i);
|
1780
1798
|
}
|
1781
1799
|
|
1782
|
-
|
1783
|
-
if ((error =
|
1800
|
+
git_str_clear(&iter->tmp_buf);
|
1801
|
+
if ((error = git_str_puts(&iter->tmp_buf, entry->path)) < 0)
|
1784
1802
|
return error;
|
1785
1803
|
|
1786
1804
|
base = iter->tmp_buf.ptr;
|
@@ -1847,7 +1865,7 @@ static void filesystem_iterator_clear(filesystem_iterator *iter)
|
|
1847
1865
|
git_array_clear(iter->frames);
|
1848
1866
|
git_ignore__free(&iter->ignores);
|
1849
1867
|
|
1850
|
-
|
1868
|
+
git_str_dispose(&iter->tmp_buf);
|
1851
1869
|
|
1852
1870
|
iterator_clear(&iter->base);
|
1853
1871
|
}
|
@@ -1881,7 +1899,7 @@ static void filesystem_iterator_free(git_iterator *i)
|
|
1881
1899
|
{
|
1882
1900
|
filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
|
1883
1901
|
git__free(iter->root);
|
1884
|
-
|
1902
|
+
git_str_dispose(&iter->current_path);
|
1885
1903
|
git_tree_free(iter->tree);
|
1886
1904
|
if (iter->index)
|
1887
1905
|
git_index_snapshot_release(&iter->index_snapshot, iter->index);
|
@@ -1935,7 +1953,7 @@ static int iterator_for_filesystem(
|
|
1935
1953
|
iter->root[root_len] = '\0';
|
1936
1954
|
iter->root_len = root_len;
|
1937
1955
|
|
1938
|
-
if ((error =
|
1956
|
+
if ((error = git_str_puts(&iter->current_path, iter->root)) < 0)
|
1939
1957
|
goto on_error;
|
1940
1958
|
|
1941
1959
|
if ((error = iterator_init_common(&iter->base, repo, index, options)) < 0)
|
@@ -1950,9 +1968,10 @@ static int iterator_for_filesystem(
|
|
1950
1968
|
|
1951
1969
|
iter->index = index;
|
1952
1970
|
iter->dirload_flags =
|
1953
|
-
(iterator__ignore_case(&iter->base) ?
|
1971
|
+
(iterator__ignore_case(&iter->base) ?
|
1972
|
+
GIT_FS_PATH_DIR_IGNORE_CASE : 0) |
|
1954
1973
|
(iterator__flag(&iter->base, PRECOMPOSE_UNICODE) ?
|
1955
|
-
|
1974
|
+
GIT_FS_PATH_DIR_PRECOMPOSE_UNICODE : 0);
|
1956
1975
|
|
1957
1976
|
if ((error = filesystem_iterator_init(iter)) < 0)
|
1958
1977
|
goto on_error;
|
@@ -2013,7 +2032,7 @@ typedef struct {
|
|
2013
2032
|
|
2014
2033
|
/* the pseudotree entry */
|
2015
2034
|
git_index_entry tree_entry;
|
2016
|
-
|
2035
|
+
git_str tree_buf;
|
2017
2036
|
bool skip_tree;
|
2018
2037
|
|
2019
2038
|
const git_index_entry *entry;
|
@@ -2047,14 +2066,14 @@ static bool index_iterator_create_pseudotree(
|
|
2047
2066
|
prev_path = iter->entry ? iter->entry->path : "";
|
2048
2067
|
|
2049
2068
|
/* determine if the new path is in a different directory from the old */
|
2050
|
-
common_len =
|
2069
|
+
common_len = git_fs_path_common_dirlen(prev_path, path);
|
2051
2070
|
relative_path = path + common_len;
|
2052
2071
|
|
2053
2072
|
if ((dirsep = strchr(relative_path, '/')) == NULL)
|
2054
2073
|
return false;
|
2055
2074
|
|
2056
|
-
|
2057
|
-
|
2075
|
+
git_str_clear(&iter->tree_buf);
|
2076
|
+
git_str_put(&iter->tree_buf, path, (dirsep - path) + 1);
|
2058
2077
|
|
2059
2078
|
iter->tree_entry.mode = GIT_FILEMODE_TREE;
|
2060
2079
|
iter->tree_entry.path = iter->tree_buf.ptr;
|
@@ -2065,8 +2084,8 @@ static bool index_iterator_create_pseudotree(
|
|
2065
2084
|
|
2066
2085
|
static int index_iterator_skip_pseudotree(index_iterator *iter)
|
2067
2086
|
{
|
2068
|
-
|
2069
|
-
|
2087
|
+
GIT_ASSERT(iterator__has_been_accessed(&iter->base));
|
2088
|
+
GIT_ASSERT(S_ISDIR(iter->entry->mode));
|
2070
2089
|
|
2071
2090
|
while (true) {
|
2072
2091
|
const git_index_entry *next_entry = NULL;
|
@@ -2219,7 +2238,7 @@ static void index_iterator_free(git_iterator *i)
|
|
2219
2238
|
index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
|
2220
2239
|
|
2221
2240
|
git_index_snapshot_release(&iter->entries, iter->base.index);
|
2222
|
-
|
2241
|
+
git_str_dispose(&iter->tree_buf);
|
2223
2242
|
}
|
2224
2243
|
|
2225
2244
|
int git_iterator_for_index(
|
@@ -2280,10 +2299,11 @@ int git_iterator_reset_range(
|
|
2280
2299
|
return i->cb->reset(i);
|
2281
2300
|
}
|
2282
2301
|
|
2283
|
-
|
2302
|
+
int git_iterator_set_ignore_case(git_iterator *i, bool ignore_case)
|
2284
2303
|
{
|
2285
|
-
|
2304
|
+
GIT_ASSERT(!iterator__has_been_accessed(i));
|
2286
2305
|
iterator_set_ignore_case(i, ignore_case);
|
2306
|
+
return 0;
|
2287
2307
|
}
|
2288
2308
|
|
2289
2309
|
void git_iterator_free(git_iterator *iter)
|
@@ -11,7 +11,7 @@
|
|
11
11
|
|
12
12
|
#include "git2/index.h"
|
13
13
|
#include "vector.h"
|
14
|
-
#include "
|
14
|
+
#include "str.h"
|
15
15
|
#include "ignore.h"
|
16
16
|
|
17
17
|
typedef struct git_iterator git_iterator;
|
@@ -21,7 +21,7 @@ typedef enum {
|
|
21
21
|
GIT_ITERATOR_TREE = 1,
|
22
22
|
GIT_ITERATOR_INDEX = 2,
|
23
23
|
GIT_ITERATOR_WORKDIR = 3,
|
24
|
-
GIT_ITERATOR_FS = 4
|
24
|
+
GIT_ITERATOR_FS = 4
|
25
25
|
} git_iterator_t;
|
26
26
|
|
27
27
|
typedef enum {
|
@@ -42,7 +42,7 @@ typedef enum {
|
|
42
42
|
/** descend into symlinked directories */
|
43
43
|
GIT_ITERATOR_DESCEND_SYMLINKS = (1u << 7),
|
44
44
|
/** hash files in workdir or filesystem iterators */
|
45
|
-
GIT_ITERATOR_INCLUDE_HASH = (1u << 8)
|
45
|
+
GIT_ITERATOR_INCLUDE_HASH = (1u << 8)
|
46
46
|
} git_iterator_flag_t;
|
47
47
|
|
48
48
|
typedef enum {
|
@@ -263,7 +263,7 @@ GIT_INLINE(bool) git_iterator_ignore_case(git_iterator *iter)
|
|
263
263
|
return ((iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0);
|
264
264
|
}
|
265
265
|
|
266
|
-
extern
|
266
|
+
extern int git_iterator_set_ignore_case(
|
267
267
|
git_iterator *iter, bool ignore_case);
|
268
268
|
|
269
269
|
extern int git_iterator_current_tree_entry(
|
@@ -278,11 +278,11 @@ extern bool git_iterator_current_tree_is_ignored(git_iterator *iter);
|
|
278
278
|
|
279
279
|
/**
|
280
280
|
* Get full path of the current item from a workdir iterator. This will
|
281
|
-
* return NULL for a non-workdir iterator. The
|
281
|
+
* return NULL for a non-workdir iterator. The git_str is still owned by
|
282
282
|
* the iterator; this is exposed just for efficiency.
|
283
283
|
*/
|
284
284
|
extern int git_iterator_current_workdir_path(
|
285
|
-
|
285
|
+
git_str **path, git_iterator *iter);
|
286
286
|
|
287
287
|
/**
|
288
288
|
* Retrieve the index stored in the iterator.
|