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
@@ -83,7 +83,7 @@ typedef enum {
|
|
83
83
|
GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
|
84
84
|
GIT_ATTR_VALUE_TRUE, /**< The attribute has been set */
|
85
85
|
GIT_ATTR_VALUE_FALSE, /**< The attribute has been unset */
|
86
|
-
GIT_ATTR_VALUE_STRING
|
86
|
+
GIT_ATTR_VALUE_STRING /**< This attribute has a value */
|
87
87
|
} git_attr_value_t;
|
88
88
|
|
89
89
|
/**
|
@@ -130,9 +130,38 @@ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
|
|
130
130
|
*
|
131
131
|
* Passing the `GIT_ATTR_CHECK_INCLUDE_HEAD` flag will use attributes
|
132
132
|
* from a `.gitattributes` file in the repository at the HEAD revision.
|
133
|
+
*
|
134
|
+
* Passing the `GIT_ATTR_CHECK_INCLUDE_COMMIT` flag will use attributes
|
135
|
+
* from a `.gitattributes` file in a specific commit.
|
133
136
|
*/
|
134
137
|
#define GIT_ATTR_CHECK_NO_SYSTEM (1 << 2)
|
135
138
|
#define GIT_ATTR_CHECK_INCLUDE_HEAD (1 << 3)
|
139
|
+
#define GIT_ATTR_CHECK_INCLUDE_COMMIT (1 << 4)
|
140
|
+
|
141
|
+
/**
|
142
|
+
* An options structure for querying attributes.
|
143
|
+
*/
|
144
|
+
typedef struct {
|
145
|
+
unsigned int version;
|
146
|
+
|
147
|
+
/** A combination of GIT_ATTR_CHECK flags */
|
148
|
+
unsigned int flags;
|
149
|
+
|
150
|
+
#ifdef GIT_DEPRECATE_HARD
|
151
|
+
void *reserved;
|
152
|
+
#else
|
153
|
+
git_oid *commit_id;
|
154
|
+
#endif
|
155
|
+
|
156
|
+
/**
|
157
|
+
* The commit to load attributes from, when
|
158
|
+
* `GIT_ATTR_CHECK_INCLUDE_COMMIT` is specified.
|
159
|
+
*/
|
160
|
+
git_oid attr_commit_id;
|
161
|
+
} git_attr_options;
|
162
|
+
|
163
|
+
#define GIT_ATTR_OPTIONS_VERSION 1
|
164
|
+
#define GIT_ATTR_OPTIONS_INIT {GIT_ATTR_OPTIONS_VERSION}
|
136
165
|
|
137
166
|
/**
|
138
167
|
* Look up the value of one git attribute for path.
|
@@ -148,6 +177,7 @@ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
|
|
148
177
|
* not have to exist, but if it does not, then it will be
|
149
178
|
* treated as a plain file (not a directory).
|
150
179
|
* @param name The name of the attribute to look up.
|
180
|
+
* @return 0 or an error code.
|
151
181
|
*/
|
152
182
|
GIT_EXTERN(int) git_attr_get(
|
153
183
|
const char **value_out,
|
@@ -156,6 +186,29 @@ GIT_EXTERN(int) git_attr_get(
|
|
156
186
|
const char *path,
|
157
187
|
const char *name);
|
158
188
|
|
189
|
+
/**
|
190
|
+
* Look up the value of one git attribute for path with extended options.
|
191
|
+
*
|
192
|
+
* @param value_out Output of the value of the attribute. Use the GIT_ATTR_...
|
193
|
+
* macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just
|
194
|
+
* use the string value for attributes set to a value. You
|
195
|
+
* should NOT modify or free this value.
|
196
|
+
* @param repo The repository containing the path.
|
197
|
+
* @param opts The `git_attr_options` to use when querying these attributes.
|
198
|
+
* @param path The path to check for attributes. Relative paths are
|
199
|
+
* interpreted relative to the repo root. The file does
|
200
|
+
* not have to exist, but if it does not, then it will be
|
201
|
+
* treated as a plain file (not a directory).
|
202
|
+
* @param name The name of the attribute to look up.
|
203
|
+
* @return 0 or an error code.
|
204
|
+
*/
|
205
|
+
GIT_EXTERN(int) git_attr_get_ext(
|
206
|
+
const char **value_out,
|
207
|
+
git_repository *repo,
|
208
|
+
git_attr_options *opts,
|
209
|
+
const char *path,
|
210
|
+
const char *name);
|
211
|
+
|
159
212
|
/**
|
160
213
|
* Look up a list of git attributes for path.
|
161
214
|
*
|
@@ -184,6 +237,7 @@ GIT_EXTERN(int) git_attr_get(
|
|
184
237
|
* it will be treated as a plain file (i.e. not a directory).
|
185
238
|
* @param num_attr The number of attributes being looked up
|
186
239
|
* @param names An array of num_attr strings containing attribute names.
|
240
|
+
* @return 0 or an error code.
|
187
241
|
*/
|
188
242
|
GIT_EXTERN(int) git_attr_get_many(
|
189
243
|
const char **values_out,
|
@@ -193,6 +247,31 @@ GIT_EXTERN(int) git_attr_get_many(
|
|
193
247
|
size_t num_attr,
|
194
248
|
const char **names);
|
195
249
|
|
250
|
+
/**
|
251
|
+
* Look up a list of git attributes for path with extended options.
|
252
|
+
*
|
253
|
+
* @param values_out An array of num_attr entries that will have string
|
254
|
+
* pointers written into it for the values of the attributes.
|
255
|
+
* You should not modify or free the values that are written
|
256
|
+
* into this array (although of course, you should free the
|
257
|
+
* array itself if you allocated it).
|
258
|
+
* @param repo The repository containing the path.
|
259
|
+
* @param opts The `git_attr_options` to use when querying these attributes.
|
260
|
+
* @param path The path inside the repo to check attributes. This
|
261
|
+
* does not have to exist, but if it does not, then
|
262
|
+
* it will be treated as a plain file (i.e. not a directory).
|
263
|
+
* @param num_attr The number of attributes being looked up
|
264
|
+
* @param names An array of num_attr strings containing attribute names.
|
265
|
+
* @return 0 or an error code.
|
266
|
+
*/
|
267
|
+
GIT_EXTERN(int) git_attr_get_many_ext(
|
268
|
+
const char **values_out,
|
269
|
+
git_repository *repo,
|
270
|
+
git_attr_options *opts,
|
271
|
+
const char *path,
|
272
|
+
size_t num_attr,
|
273
|
+
const char **names);
|
274
|
+
|
196
275
|
/**
|
197
276
|
* The callback used with git_attr_foreach.
|
198
277
|
*
|
@@ -231,6 +310,26 @@ GIT_EXTERN(int) git_attr_foreach(
|
|
231
310
|
git_attr_foreach_cb callback,
|
232
311
|
void *payload);
|
233
312
|
|
313
|
+
/**
|
314
|
+
* Loop over all the git attributes for a path with extended options.
|
315
|
+
*
|
316
|
+
* @param repo The repository containing the path.
|
317
|
+
* @param opts The `git_attr_options` to use when querying these attributes.
|
318
|
+
* @param path Path inside the repo to check attributes. This does not have
|
319
|
+
* to exist, but if it does not, then it will be treated as a
|
320
|
+
* plain file (i.e. not a directory).
|
321
|
+
* @param callback Function to invoke on each attribute name and value.
|
322
|
+
* See git_attr_foreach_cb.
|
323
|
+
* @param payload Passed on as extra parameter to callback function.
|
324
|
+
* @return 0 on success, non-zero callback return value, or error code
|
325
|
+
*/
|
326
|
+
GIT_EXTERN(int) git_attr_foreach_ext(
|
327
|
+
git_repository *repo,
|
328
|
+
git_attr_options *opts,
|
329
|
+
const char *path,
|
330
|
+
git_attr_foreach_cb callback,
|
331
|
+
void *payload);
|
332
|
+
|
234
333
|
/**
|
235
334
|
* Flush the gitattributes cache.
|
236
335
|
*
|
@@ -249,11 +348,16 @@ GIT_EXTERN(int) git_attr_cache_flush(
|
|
249
348
|
* Add a macro definition.
|
250
349
|
*
|
251
350
|
* Macros will automatically be loaded from the top level `.gitattributes`
|
252
|
-
* file of the repository (plus the
|
351
|
+
* file of the repository (plus the built-in "binary" macro). This
|
253
352
|
* function allows you to add others. For example, to add the default
|
254
353
|
* macro, you would call:
|
255
354
|
*
|
256
355
|
* git_attr_add_macro(repo, "binary", "-diff -crlf");
|
356
|
+
*
|
357
|
+
* @param repo The repository to add the macro in.
|
358
|
+
* @param name The name of the macro.
|
359
|
+
* @param values The value for the macro.
|
360
|
+
* @return 0 or an error code.
|
257
361
|
*/
|
258
362
|
GIT_EXTERN(int) git_attr_add_macro(
|
259
363
|
git_repository *repo,
|
@@ -26,29 +26,54 @@ GIT_BEGIN_DECL
|
|
26
26
|
typedef enum {
|
27
27
|
/** Normal blame, the default */
|
28
28
|
GIT_BLAME_NORMAL = 0,
|
29
|
-
|
30
|
-
|
29
|
+
|
30
|
+
/**
|
31
|
+
* Track lines that have moved within a file (like `git blame -M`).
|
32
|
+
*
|
33
|
+
* This is not yet implemented and reserved for future use.
|
34
|
+
*/
|
31
35
|
GIT_BLAME_TRACK_COPIES_SAME_FILE = (1<<0),
|
32
|
-
|
33
|
-
|
36
|
+
|
37
|
+
/**
|
38
|
+
* Track lines that have moved across files in the same commit
|
39
|
+
* (like `git blame -C`).
|
40
|
+
*
|
41
|
+
* This is not yet implemented and reserved for future use.
|
42
|
+
*/
|
34
43
|
GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES = (1<<1),
|
35
|
-
|
36
|
-
|
37
|
-
*
|
44
|
+
|
45
|
+
/**
|
46
|
+
* Track lines that have been copied from another file that exists
|
47
|
+
* in the same commit (like `git blame -CC`). Implies SAME_FILE.
|
48
|
+
*
|
49
|
+
* This is not yet implemented and reserved for future use.
|
50
|
+
*/
|
38
51
|
GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES = (1<<2),
|
39
|
-
|
40
|
-
|
41
|
-
*
|
52
|
+
|
53
|
+
/**
|
54
|
+
* Track lines that have been copied from another file that exists in
|
55
|
+
* *any* commit (like `git blame -CCC`). Implies SAME_COMMIT_COPIES.
|
56
|
+
*
|
57
|
+
* This is not yet implemented and reserved for future use.
|
58
|
+
*/
|
42
59
|
GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES = (1<<3),
|
43
|
-
|
44
|
-
|
60
|
+
|
61
|
+
/**
|
62
|
+
* Restrict the search of commits to those reachable following only
|
63
|
+
* the first parents.
|
64
|
+
*/
|
45
65
|
GIT_BLAME_FIRST_PARENT = (1<<4),
|
46
|
-
|
47
|
-
|
48
|
-
*
|
66
|
+
|
67
|
+
/**
|
68
|
+
* Use mailmap file to map author and committer names and email
|
69
|
+
* addresses to canonical real names and email addresses. The
|
70
|
+
* mailmap will be read from the working directory, or HEAD in a
|
71
|
+
* bare repository.
|
72
|
+
*/
|
49
73
|
GIT_BLAME_USE_MAILMAP = (1<<5),
|
74
|
+
|
50
75
|
/** Ignore whitespace differences */
|
51
|
-
GIT_BLAME_IGNORE_WHITESPACE = (1<<6)
|
76
|
+
GIT_BLAME_IGNORE_WHITESPACE = (1<<6)
|
52
77
|
} git_blame_flag_t;
|
53
78
|
|
54
79
|
/**
|
@@ -63,25 +88,33 @@ typedef struct git_blame_options {
|
|
63
88
|
|
64
89
|
/** A combination of `git_blame_flag_t` */
|
65
90
|
uint32_t flags;
|
66
|
-
|
67
|
-
|
68
|
-
*
|
69
|
-
*
|
70
|
-
*
|
91
|
+
|
92
|
+
/**
|
93
|
+
* The lower bound on the number of alphanumeric characters that
|
94
|
+
* must be detected as moving/copying within a file for it to
|
95
|
+
* associate those lines with the parent commit. The default value
|
96
|
+
* is 20.
|
97
|
+
*
|
98
|
+
* This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
|
99
|
+
* flags are specified.
|
71
100
|
*/
|
72
101
|
uint16_t min_match_characters;
|
102
|
+
|
73
103
|
/** The id of the newest commit to consider. The default is HEAD. */
|
74
104
|
git_oid newest_commit;
|
105
|
+
|
75
106
|
/**
|
76
107
|
* The id of the oldest commit to consider.
|
77
108
|
* The default is the first commit encountered with a NULL parent.
|
78
109
|
*/
|
79
110
|
git_oid oldest_commit;
|
111
|
+
|
80
112
|
/**
|
81
113
|
* The first line in the file to blame.
|
82
114
|
* The default is 1 (line numbers start with 1).
|
83
115
|
*/
|
84
116
|
size_t min_line;
|
117
|
+
|
85
118
|
/**
|
86
119
|
* The last line in the file to blame.
|
87
120
|
* The default is the last line of the file.
|
@@ -108,41 +141,59 @@ GIT_EXTERN(int) git_blame_options_init(
|
|
108
141
|
|
109
142
|
/**
|
110
143
|
* Structure that represents a blame hunk.
|
111
|
-
*
|
112
|
-
* - `lines_in_hunk` is the number of lines in this hunk
|
113
|
-
* - `final_commit_id` is the OID of the commit where this line was last
|
114
|
-
* changed.
|
115
|
-
* - `final_start_line_number` is the 1-based line number where this hunk
|
116
|
-
* begins, in the final version of the file
|
117
|
-
* - `final_signature` is the author of `final_commit_id`. If
|
118
|
-
* `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
|
119
|
-
* real name and email address.
|
120
|
-
* - `orig_commit_id` is the OID of the commit where this hunk was found. This
|
121
|
-
* will usually be the same as `final_commit_id`, except when
|
122
|
-
* `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
|
123
|
-
* - `orig_path` is the path to the file where this hunk originated, as of the
|
124
|
-
* commit specified by `orig_commit_id`.
|
125
|
-
* - `orig_start_line_number` is the 1-based line number where this hunk begins
|
126
|
-
* in the file named by `orig_path` in the commit specified by
|
127
|
-
* `orig_commit_id`.
|
128
|
-
* - `orig_signature` is the author of `orig_commit_id`. If
|
129
|
-
* `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
|
130
|
-
* real name and email address.
|
131
|
-
* - `boundary` is 1 iff the hunk has been tracked to a boundary commit (the
|
132
|
-
* root, or the commit specified in git_blame_options.oldest_commit)
|
133
144
|
*/
|
134
145
|
typedef struct git_blame_hunk {
|
146
|
+
/**
|
147
|
+
* The number of lines in this hunk.
|
148
|
+
*/
|
135
149
|
size_t lines_in_hunk;
|
136
150
|
|
151
|
+
/**
|
152
|
+
* The OID of the commit where this line was last changed.
|
153
|
+
*/
|
137
154
|
git_oid final_commit_id;
|
155
|
+
|
156
|
+
/**
|
157
|
+
* The 1-based line number where this hunk begins, in the final version
|
158
|
+
* of the file.
|
159
|
+
*/
|
138
160
|
size_t final_start_line_number;
|
161
|
+
|
162
|
+
/**
|
163
|
+
* The author of `final_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been
|
164
|
+
* specified, it will contain the canonical real name and email address.
|
165
|
+
*/
|
139
166
|
git_signature *final_signature;
|
140
167
|
|
168
|
+
/**
|
169
|
+
* The OID of the commit where this hunk was found.
|
170
|
+
* This will usually be the same as `final_commit_id`, except when
|
171
|
+
* `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
|
172
|
+
*/
|
141
173
|
git_oid orig_commit_id;
|
174
|
+
|
175
|
+
/**
|
176
|
+
* The path to the file where this hunk originated, as of the commit
|
177
|
+
* specified by `orig_commit_id`.
|
178
|
+
*/
|
142
179
|
const char *orig_path;
|
180
|
+
|
181
|
+
/**
|
182
|
+
* The 1-based line number where this hunk begins in the file named by
|
183
|
+
* `orig_path` in the commit specified by `orig_commit_id`.
|
184
|
+
*/
|
143
185
|
size_t orig_start_line_number;
|
186
|
+
|
187
|
+
/**
|
188
|
+
* The author of `orig_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been
|
189
|
+
* specified, it will contain the canonical real name and email address.
|
190
|
+
*/
|
144
191
|
git_signature *orig_signature;
|
145
192
|
|
193
|
+
/**
|
194
|
+
* The 1 iff the hunk has been tracked to a boundary commit (the root,
|
195
|
+
* or the commit specified in git_blame_options.oldest_commit)
|
196
|
+
*/
|
146
197
|
char boundary;
|
147
198
|
} git_blame_hunk;
|
148
199
|
|
@@ -152,6 +203,9 @@ typedef struct git_blame git_blame;
|
|
152
203
|
|
153
204
|
/**
|
154
205
|
* Gets the number of hunks that exist in the blame structure.
|
206
|
+
*
|
207
|
+
* @param blame The blame structure to query.
|
208
|
+
* @return The number of hunks.
|
155
209
|
*/
|
156
210
|
GIT_EXTERN(uint32_t) git_blame_get_hunk_count(git_blame *blame);
|
157
211
|
|
@@ -84,7 +84,7 @@ GIT_EXTERN(git_repository *) git_blob_owner(const git_blob *blob);
|
|
84
84
|
* time.
|
85
85
|
*
|
86
86
|
* @param blob pointer to the blob
|
87
|
-
* @return the pointer
|
87
|
+
* @return the pointer, or NULL on error
|
88
88
|
*/
|
89
89
|
GIT_EXTERN(const void *) git_blob_rawcontent(const git_blob *blob);
|
90
90
|
|
@@ -113,7 +113,13 @@ typedef enum {
|
|
113
113
|
* When set, filters will be loaded from a `.gitattributes` file
|
114
114
|
* in the HEAD commit.
|
115
115
|
*/
|
116
|
-
|
116
|
+
GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD = (1 << 2),
|
117
|
+
|
118
|
+
/**
|
119
|
+
* When set, filters will be loaded from a `.gitattributes` file
|
120
|
+
* in the specified commit.
|
121
|
+
*/
|
122
|
+
GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT = (1 << 3)
|
117
123
|
} git_blob_filter_flag_t;
|
118
124
|
|
119
125
|
/**
|
@@ -128,6 +134,18 @@ typedef struct {
|
|
128
134
|
|
129
135
|
/** Flags to control the filtering process, see `git_blob_filter_flag_t` above */
|
130
136
|
uint32_t flags;
|
137
|
+
|
138
|
+
#ifdef GIT_DEPRECATE_HARD
|
139
|
+
void *reserved;
|
140
|
+
#else
|
141
|
+
git_oid *commit_id;
|
142
|
+
#endif
|
143
|
+
|
144
|
+
/**
|
145
|
+
* The commit to load attributes from, when
|
146
|
+
* `GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT` is specified.
|
147
|
+
*/
|
148
|
+
git_oid attr_commit_id;
|
131
149
|
} git_blob_filter_options;
|
132
150
|
|
133
151
|
#define GIT_BLOB_FILTER_OPTIONS_VERSION 1
|
@@ -266,12 +284,25 @@ GIT_EXTERN(int) git_blob_create_from_buffer(
|
|
266
284
|
*/
|
267
285
|
GIT_EXTERN(int) git_blob_is_binary(const git_blob *blob);
|
268
286
|
|
287
|
+
/**
|
288
|
+
* Determine if the given content is most certainly binary or not;
|
289
|
+
* this is the same mechanism used by `git_blob_is_binary` but only
|
290
|
+
* looking at raw data.
|
291
|
+
*
|
292
|
+
* @param data The blob data which content should be analyzed
|
293
|
+
* @param len The length of the data
|
294
|
+
* @return 1 if the content of the blob is detected
|
295
|
+
* as binary; 0 otherwise.
|
296
|
+
*/
|
297
|
+
GIT_EXTERN(int) git_blob_data_is_binary(const char *data, size_t len);
|
298
|
+
|
269
299
|
/**
|
270
300
|
* Create an in-memory copy of a blob. The copy must be explicitly
|
271
301
|
* free'd or it will leak.
|
272
302
|
*
|
273
303
|
* @param out Pointer to store the copy of the object
|
274
304
|
* @param source Original object to copy
|
305
|
+
* @return 0.
|
275
306
|
*/
|
276
307
|
GIT_EXTERN(int) git_blob_dup(git_blob **out, git_blob *source);
|
277
308
|
|
@@ -34,6 +34,8 @@ GIT_BEGIN_DECL
|
|
34
34
|
*
|
35
35
|
* @param out Pointer where to store the underlying reference.
|
36
36
|
*
|
37
|
+
* @param repo the repository to create the branch in.
|
38
|
+
*
|
37
39
|
* @param branch_name Name for the branch; this name is
|
38
40
|
* validated for consistency. It should also not conflict with
|
39
41
|
* an already existing branch name.
|
@@ -304,6 +306,31 @@ GIT_EXTERN(int) git_branch_remote_name(
|
|
304
306
|
*/
|
305
307
|
GIT_EXTERN(int) git_branch_upstream_remote(git_buf *buf, git_repository *repo, const char *refname);
|
306
308
|
|
309
|
+
/**
|
310
|
+
* Retrieve the upstream merge of a local branch
|
311
|
+
*
|
312
|
+
* This will return the currently configured "branch.*.merge" for a given
|
313
|
+
* branch. This branch must be local.
|
314
|
+
*
|
315
|
+
* @param buf the buffer into which to write the name
|
316
|
+
* @param repo the repository in which to look
|
317
|
+
* @param refname the full name of the branch
|
318
|
+
* @return 0 or an error code
|
319
|
+
*/
|
320
|
+
GIT_EXTERN(int) git_branch_upstream_merge(git_buf *buf, git_repository *repo, const char *refname);
|
321
|
+
|
322
|
+
/**
|
323
|
+
* Determine whether a branch name is valid, meaning that (when prefixed
|
324
|
+
* with `refs/heads/`) that it is a valid reference name, and that any
|
325
|
+
* additional branch name restrictions are imposed (eg, it cannot start
|
326
|
+
* with a `-`).
|
327
|
+
*
|
328
|
+
* @param valid output pointer to set with validity of given branch name
|
329
|
+
* @param name a branch name to test
|
330
|
+
* @return 0 on success or an error code
|
331
|
+
*/
|
332
|
+
GIT_EXTERN(int) git_branch_name_is_valid(int *valid, const char *name);
|
333
|
+
|
307
334
|
/** @} */
|
308
335
|
GIT_END_DECL
|
309
336
|
#endif
|
@@ -23,110 +23,50 @@ GIT_BEGIN_DECL
|
|
23
23
|
*
|
24
24
|
* Sometimes libgit2 wants to return an allocated data buffer to the
|
25
25
|
* caller and have the caller take responsibility for freeing that memory.
|
26
|
-
*
|
27
|
-
*
|
28
|
-
*
|
29
|
-
* release it when they are done.
|
26
|
+
* To make ownership clear in these cases, libgit2 uses `git_buf` to
|
27
|
+
* return this data. Callers should use `git_buf_dispose()` to release
|
28
|
+
* the memory when they are done.
|
30
29
|
*
|
31
|
-
* A `git_buf`
|
32
|
-
*
|
33
|
-
* free the memory, but will read from it as needed.
|
34
|
-
*
|
35
|
-
* Some APIs may occasionally do something slightly unusual with a buffer,
|
36
|
-
* such as setting `ptr` to a value that was passed in by the user. In
|
37
|
-
* those cases, the behavior will be clearly documented by the API.
|
30
|
+
* A `git_buf` contains a pointer to a NUL-terminated C string, and
|
31
|
+
* the length of the string (not including the NUL terminator).
|
38
32
|
*/
|
39
33
|
typedef struct {
|
40
34
|
/**
|
41
|
-
* The buffer contents.
|
42
|
-
*
|
43
|
-
* `
|
44
|
-
*
|
45
|
-
* to overwrite it with new data.
|
35
|
+
* The buffer contents. `ptr` points to the start of the buffer
|
36
|
+
* being returned. The buffer's length (in bytes) is specified
|
37
|
+
* by the `size` member of the structure, and contains a NUL
|
38
|
+
* terminator at position `(size + 1)`.
|
46
39
|
*/
|
47
|
-
char
|
40
|
+
char *ptr;
|
48
41
|
|
49
42
|
/**
|
50
|
-
*
|
51
|
-
* was allocated by libgit2. It may be larger than `size`. If `ptr`
|
52
|
-
* was not allocated by libgit2 and should not be resized and/or freed,
|
53
|
-
* then `asize` will be set to zero.
|
43
|
+
* This field is reserved and unused.
|
54
44
|
*/
|
55
|
-
size_t
|
45
|
+
size_t reserved;
|
56
46
|
|
57
47
|
/**
|
58
|
-
*
|
48
|
+
* The length (in bytes) of the buffer pointed to by `ptr`,
|
49
|
+
* not including a NUL terminator.
|
59
50
|
*/
|
60
51
|
size_t size;
|
61
52
|
} git_buf;
|
62
53
|
|
63
54
|
/**
|
64
|
-
*
|
55
|
+
* Use to initialize a `git_buf` before passing it to a function that
|
56
|
+
* will populate it.
|
65
57
|
*/
|
66
|
-
#define
|
58
|
+
#define GIT_BUF_INIT { NULL, 0, 0 }
|
67
59
|
|
68
60
|
/**
|
69
61
|
* Free the memory referred to by the git_buf.
|
70
62
|
*
|
71
63
|
* Note that this does not free the `git_buf` itself, just the memory
|
72
|
-
* pointed to by `buffer->ptr`.
|
73
|
-
* like it was not allocated internally, but it will clear the buffer back
|
74
|
-
* to the empty state.
|
64
|
+
* pointed to by `buffer->ptr`.
|
75
65
|
*
|
76
66
|
* @param buffer The buffer to deallocate
|
77
67
|
*/
|
78
68
|
GIT_EXTERN(void) git_buf_dispose(git_buf *buffer);
|
79
69
|
|
80
|
-
/**
|
81
|
-
* Resize the buffer allocation to make more space.
|
82
|
-
*
|
83
|
-
* This will attempt to grow the buffer to accommodate the target size.
|
84
|
-
*
|
85
|
-
* If the buffer refers to memory that was not allocated by libgit2 (i.e.
|
86
|
-
* the `asize` field is zero), then `ptr` will be replaced with a newly
|
87
|
-
* allocated block of data. Be careful so that memory allocated by the
|
88
|
-
* caller is not lost. As a special variant, if you pass `target_size` as
|
89
|
-
* 0 and the memory is not allocated by libgit2, this will allocate a new
|
90
|
-
* buffer of size `size` and copy the external data into it.
|
91
|
-
*
|
92
|
-
* Currently, this will never shrink a buffer, only expand it.
|
93
|
-
*
|
94
|
-
* If the allocation fails, this will return an error and the buffer will be
|
95
|
-
* marked as invalid for future operations, invaliding the contents.
|
96
|
-
*
|
97
|
-
* @param buffer The buffer to be resized; may or may not be allocated yet
|
98
|
-
* @param target_size The desired available size
|
99
|
-
* @return 0 on success, -1 on allocation failure
|
100
|
-
*/
|
101
|
-
GIT_EXTERN(int) git_buf_grow(git_buf *buffer, size_t target_size);
|
102
|
-
|
103
|
-
/**
|
104
|
-
* Set buffer to a copy of some raw data.
|
105
|
-
*
|
106
|
-
* @param buffer The buffer to set
|
107
|
-
* @param data The data to copy into the buffer
|
108
|
-
* @param datalen The length of the data to copy into the buffer
|
109
|
-
* @return 0 on success, -1 on allocation failure
|
110
|
-
*/
|
111
|
-
GIT_EXTERN(int) git_buf_set(
|
112
|
-
git_buf *buffer, const void *data, size_t datalen);
|
113
|
-
|
114
|
-
/**
|
115
|
-
* Check quickly if buffer looks like it contains binary data
|
116
|
-
*
|
117
|
-
* @param buf Buffer to check
|
118
|
-
* @return 1 if buffer looks like non-text data
|
119
|
-
*/
|
120
|
-
GIT_EXTERN(int) git_buf_is_binary(const git_buf *buf);
|
121
|
-
|
122
|
-
/**
|
123
|
-
* Check quickly if buffer contains a NUL byte
|
124
|
-
*
|
125
|
-
* @param buf Buffer to check
|
126
|
-
* @return 1 if buffer contains a NUL byte
|
127
|
-
*/
|
128
|
-
GIT_EXTERN(int) git_buf_contains_nul(const git_buf *buf);
|
129
|
-
|
130
70
|
GIT_END_DECL
|
131
71
|
|
132
72
|
/** @} */
|