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
data/vendor/libgit2/src/branch.c
CHANGED
@@ -7,6 +7,7 @@
|
|
7
7
|
|
8
8
|
#include "branch.h"
|
9
9
|
|
10
|
+
#include "buf.h"
|
10
11
|
#include "commit.h"
|
11
12
|
#include "tag.h"
|
12
13
|
#include "config.h"
|
@@ -27,11 +28,11 @@ static int retrieve_branch_reference(
|
|
27
28
|
git_reference *branch = NULL;
|
28
29
|
int error = 0;
|
29
30
|
char *prefix;
|
30
|
-
|
31
|
+
git_str ref_name = GIT_STR_INIT;
|
31
32
|
|
32
33
|
prefix = is_remote ? GIT_REFS_REMOTES_DIR : GIT_REFS_HEADS_DIR;
|
33
34
|
|
34
|
-
if ((error =
|
35
|
+
if ((error = git_str_joinpath(&ref_name, prefix, branch_name)) < 0)
|
35
36
|
/* OOM */;
|
36
37
|
else if ((error = git_reference_lookup(&branch, repo, ref_name.ptr)) < 0)
|
37
38
|
git_error_set(
|
@@ -40,7 +41,7 @@ static int retrieve_branch_reference(
|
|
40
41
|
|
41
42
|
*branch_reference_out = branch; /* will be NULL on error */
|
42
43
|
|
43
|
-
|
44
|
+
git_str_dispose(&ref_name);
|
44
45
|
return error;
|
45
46
|
}
|
46
47
|
|
@@ -62,13 +63,15 @@ static int create_branch(
|
|
62
63
|
{
|
63
64
|
int is_unmovable_head = 0;
|
64
65
|
git_reference *branch = NULL;
|
65
|
-
|
66
|
-
log_message =
|
66
|
+
git_str canonical_branch_name = GIT_STR_INIT,
|
67
|
+
log_message = GIT_STR_INIT;
|
67
68
|
int error = -1;
|
68
69
|
int bare = git_repository_is_bare(repository);
|
69
70
|
|
70
|
-
|
71
|
-
|
71
|
+
GIT_ASSERT_ARG(branch_name);
|
72
|
+
GIT_ASSERT_ARG(commit);
|
73
|
+
GIT_ASSERT_ARG(ref_out);
|
74
|
+
GIT_ASSERT_ARG(git_commit_owner(commit) == repository);
|
72
75
|
|
73
76
|
if (!git__strcmp(branch_name, "HEAD")) {
|
74
77
|
git_error_set(GIT_ERROR_REFERENCE, "'HEAD' is not a valid branch name");
|
@@ -94,22 +97,22 @@ static int create_branch(
|
|
94
97
|
goto cleanup;
|
95
98
|
}
|
96
99
|
|
97
|
-
if (
|
100
|
+
if (git_str_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0)
|
98
101
|
goto cleanup;
|
99
102
|
|
100
|
-
if (
|
103
|
+
if (git_str_printf(&log_message, "branch: Created from %s", from) < 0)
|
101
104
|
goto cleanup;
|
102
105
|
|
103
106
|
error = git_reference_create(&branch, repository,
|
104
|
-
|
105
|
-
|
107
|
+
git_str_cstr(&canonical_branch_name), git_commit_id(commit), force,
|
108
|
+
git_str_cstr(&log_message));
|
106
109
|
|
107
110
|
if (!error)
|
108
111
|
*ref_out = branch;
|
109
112
|
|
110
113
|
cleanup:
|
111
|
-
|
112
|
-
|
114
|
+
git_str_dispose(&canonical_branch_name);
|
115
|
+
git_str_dispose(&log_message);
|
113
116
|
return error;
|
114
117
|
}
|
115
118
|
|
@@ -120,7 +123,10 @@ int git_branch_create(
|
|
120
123
|
const git_commit *commit,
|
121
124
|
int force)
|
122
125
|
{
|
123
|
-
|
126
|
+
char commit_id[GIT_OID_HEXSZ + 1];
|
127
|
+
|
128
|
+
git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit));
|
129
|
+
return create_branch(ref_out, repository, branch_name, commit, commit_id, force);
|
124
130
|
}
|
125
131
|
|
126
132
|
int git_branch_create_from_annotated(
|
@@ -161,6 +167,8 @@ out:
|
|
161
167
|
|
162
168
|
int git_branch_is_checked_out(const git_reference *branch)
|
163
169
|
{
|
170
|
+
GIT_ASSERT_ARG(branch);
|
171
|
+
|
164
172
|
if (!git_reference_is_branch(branch))
|
165
173
|
return 0;
|
166
174
|
return git_repository_foreach_worktree(git_reference_owner(branch),
|
@@ -170,10 +178,10 @@ int git_branch_is_checked_out(const git_reference *branch)
|
|
170
178
|
int git_branch_delete(git_reference *branch)
|
171
179
|
{
|
172
180
|
int is_head;
|
173
|
-
|
181
|
+
git_str config_section = GIT_STR_INIT;
|
174
182
|
int error = -1;
|
175
183
|
|
176
|
-
|
184
|
+
GIT_ASSERT_ARG(branch);
|
177
185
|
|
178
186
|
if (!git_reference_is_branch(branch) && !git_reference_is_remote(branch)) {
|
179
187
|
git_error_set(GIT_ERROR_INVALID, "reference '%s' is not a valid branch.",
|
@@ -196,18 +204,18 @@ int git_branch_delete(git_reference *branch)
|
|
196
204
|
return -1;
|
197
205
|
}
|
198
206
|
|
199
|
-
if (
|
207
|
+
if (git_str_join(&config_section, '.', "branch",
|
200
208
|
git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)) < 0)
|
201
209
|
goto on_error;
|
202
210
|
|
203
211
|
if (git_config_rename_section(
|
204
|
-
git_reference_owner(branch),
|
212
|
+
git_reference_owner(branch), git_str_cstr(&config_section), NULL) < 0)
|
205
213
|
goto on_error;
|
206
214
|
|
207
215
|
error = git_reference_delete(branch);
|
208
216
|
|
209
217
|
on_error:
|
210
|
-
|
218
|
+
git_str_dispose(&config_section);
|
211
219
|
return error;
|
212
220
|
}
|
213
221
|
|
@@ -282,46 +290,47 @@ int git_branch_move(
|
|
282
290
|
const char *new_branch_name,
|
283
291
|
int force)
|
284
292
|
{
|
285
|
-
|
286
|
-
old_config_section =
|
287
|
-
new_config_section =
|
288
|
-
log_message =
|
293
|
+
git_str new_reference_name = GIT_STR_INIT,
|
294
|
+
old_config_section = GIT_STR_INIT,
|
295
|
+
new_config_section = GIT_STR_INIT,
|
296
|
+
log_message = GIT_STR_INIT;
|
289
297
|
int error;
|
290
298
|
|
291
|
-
|
299
|
+
GIT_ASSERT_ARG(branch);
|
300
|
+
GIT_ASSERT_ARG(new_branch_name);
|
292
301
|
|
293
302
|
if (!git_reference_is_branch(branch))
|
294
303
|
return not_a_local_branch(git_reference_name(branch));
|
295
304
|
|
296
|
-
if ((error =
|
305
|
+
if ((error = git_str_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0)
|
297
306
|
goto done;
|
298
307
|
|
299
|
-
if ((error =
|
300
|
-
git_reference_name(branch),
|
308
|
+
if ((error = git_str_printf(&log_message, "branch: renamed %s to %s",
|
309
|
+
git_reference_name(branch), git_str_cstr(&new_reference_name))) < 0)
|
301
310
|
goto done;
|
302
311
|
|
303
312
|
/* first update ref then config so failure won't trash config */
|
304
313
|
|
305
314
|
error = git_reference_rename(
|
306
|
-
out, branch,
|
307
|
-
|
315
|
+
out, branch, git_str_cstr(&new_reference_name), force,
|
316
|
+
git_str_cstr(&log_message));
|
308
317
|
if (error < 0)
|
309
318
|
goto done;
|
310
319
|
|
311
|
-
|
320
|
+
git_str_join(&old_config_section, '.', "branch",
|
312
321
|
git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR));
|
313
|
-
|
322
|
+
git_str_join(&new_config_section, '.', "branch", new_branch_name);
|
314
323
|
|
315
324
|
error = git_config_rename_section(
|
316
325
|
git_reference_owner(branch),
|
317
|
-
|
318
|
-
|
326
|
+
git_str_cstr(&old_config_section),
|
327
|
+
git_str_cstr(&new_config_section));
|
319
328
|
|
320
329
|
done:
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
330
|
+
git_str_dispose(&new_reference_name);
|
331
|
+
git_str_dispose(&old_config_section);
|
332
|
+
git_str_dispose(&new_config_section);
|
333
|
+
git_str_dispose(&log_message);
|
325
334
|
|
326
335
|
return error;
|
327
336
|
}
|
@@ -333,7 +342,10 @@ int git_branch_lookup(
|
|
333
342
|
git_branch_t branch_type)
|
334
343
|
{
|
335
344
|
int error = -1;
|
336
|
-
|
345
|
+
|
346
|
+
GIT_ASSERT_ARG(ref_out);
|
347
|
+
GIT_ASSERT_ARG(repo);
|
348
|
+
GIT_ASSERT_ARG(branch_name);
|
337
349
|
|
338
350
|
switch (branch_type) {
|
339
351
|
case GIT_BRANCH_LOCAL:
|
@@ -346,7 +358,7 @@ int git_branch_lookup(
|
|
346
358
|
error = retrieve_branch_reference(ref_out, repo, branch_name, true);
|
347
359
|
break;
|
348
360
|
default:
|
349
|
-
|
361
|
+
GIT_ASSERT(false);
|
350
362
|
}
|
351
363
|
return error;
|
352
364
|
}
|
@@ -357,7 +369,8 @@ int git_branch_name(
|
|
357
369
|
{
|
358
370
|
const char *branch_name;
|
359
371
|
|
360
|
-
|
372
|
+
GIT_ASSERT_ARG(out);
|
373
|
+
GIT_ASSERT_ARG(ref);
|
361
374
|
|
362
375
|
branch_name = ref->name;
|
363
376
|
|
@@ -375,20 +388,20 @@ int git_branch_name(
|
|
375
388
|
}
|
376
389
|
|
377
390
|
static int retrieve_upstream_configuration(
|
378
|
-
|
391
|
+
git_str *out,
|
379
392
|
const git_config *config,
|
380
393
|
const char *canonical_branch_name,
|
381
394
|
const char *format)
|
382
395
|
{
|
383
|
-
|
396
|
+
git_str buf = GIT_STR_INIT;
|
384
397
|
int error;
|
385
398
|
|
386
|
-
if (
|
399
|
+
if (git_str_printf(&buf, format,
|
387
400
|
canonical_branch_name + strlen(GIT_REFS_HEADS_DIR)) < 0)
|
388
401
|
return -1;
|
389
402
|
|
390
|
-
error =
|
391
|
-
|
403
|
+
error = git_config__get_string_buf(out, config, git_str_cstr(&buf));
|
404
|
+
git_str_dispose(&buf);
|
392
405
|
return error;
|
393
406
|
}
|
394
407
|
|
@@ -397,17 +410,25 @@ int git_branch_upstream_name(
|
|
397
410
|
git_repository *repo,
|
398
411
|
const char *refname)
|
399
412
|
{
|
400
|
-
|
401
|
-
|
402
|
-
|
413
|
+
GIT_BUF_WRAP_PRIVATE(out, git_branch__upstream_name, repo, refname);
|
414
|
+
}
|
415
|
+
|
416
|
+
int git_branch__upstream_name(
|
417
|
+
git_str *out,
|
418
|
+
git_repository *repo,
|
419
|
+
const char *refname)
|
420
|
+
{
|
421
|
+
git_str remote_name = GIT_STR_INIT;
|
422
|
+
git_str merge_name = GIT_STR_INIT;
|
423
|
+
git_str buf = GIT_STR_INIT;
|
403
424
|
int error = -1;
|
404
425
|
git_remote *remote = NULL;
|
405
426
|
const git_refspec *refspec;
|
406
427
|
git_config *config;
|
407
428
|
|
408
|
-
|
409
|
-
|
410
|
-
|
429
|
+
GIT_ASSERT_ARG(out);
|
430
|
+
GIT_ASSERT_ARG(repo);
|
431
|
+
GIT_ASSERT_ARG(refname);
|
411
432
|
|
412
433
|
if (!git_reference__is_branch(refname))
|
413
434
|
return not_a_local_branch(refname);
|
@@ -423,66 +444,109 @@ int git_branch_upstream_name(
|
|
423
444
|
&merge_name, config, refname, "branch.%s.merge")) < 0)
|
424
445
|
goto cleanup;
|
425
446
|
|
426
|
-
if (
|
447
|
+
if (git_str_len(&remote_name) == 0 || git_str_len(&merge_name) == 0) {
|
427
448
|
git_error_set(GIT_ERROR_REFERENCE,
|
428
449
|
"branch '%s' does not have an upstream", refname);
|
429
450
|
error = GIT_ENOTFOUND;
|
430
451
|
goto cleanup;
|
431
452
|
}
|
432
453
|
|
433
|
-
if (strcmp(".",
|
434
|
-
if ((error = git_remote_lookup(&remote, repo,
|
454
|
+
if (strcmp(".", git_str_cstr(&remote_name)) != 0) {
|
455
|
+
if ((error = git_remote_lookup(&remote, repo, git_str_cstr(&remote_name))) < 0)
|
435
456
|
goto cleanup;
|
436
457
|
|
437
|
-
refspec = git_remote__matching_refspec(remote,
|
458
|
+
refspec = git_remote__matching_refspec(remote, git_str_cstr(&merge_name));
|
438
459
|
if (!refspec) {
|
439
460
|
error = GIT_ENOTFOUND;
|
440
461
|
goto cleanup;
|
441
462
|
}
|
442
463
|
|
443
|
-
if (
|
464
|
+
if (git_refspec__transform(&buf, refspec, git_str_cstr(&merge_name)) < 0)
|
444
465
|
goto cleanup;
|
445
466
|
} else
|
446
|
-
if (
|
467
|
+
if (git_str_set(&buf, git_str_cstr(&merge_name), git_str_len(&merge_name)) < 0)
|
447
468
|
goto cleanup;
|
448
469
|
|
449
|
-
|
470
|
+
git_str_swap(out, &buf);
|
450
471
|
|
451
472
|
cleanup:
|
452
473
|
git_config_free(config);
|
453
474
|
git_remote_free(remote);
|
454
|
-
|
455
|
-
|
456
|
-
|
475
|
+
git_str_dispose(&remote_name);
|
476
|
+
git_str_dispose(&merge_name);
|
477
|
+
git_str_dispose(&buf);
|
457
478
|
return error;
|
458
479
|
}
|
459
480
|
|
460
|
-
int
|
481
|
+
static int git_branch_upstream_with_format(
|
482
|
+
git_str *out,
|
483
|
+
git_repository *repo,
|
484
|
+
const char *refname,
|
485
|
+
const char *format,
|
486
|
+
const char *format_name)
|
461
487
|
{
|
462
|
-
int error;
|
463
488
|
git_config *cfg;
|
489
|
+
int error;
|
464
490
|
|
465
491
|
if (!git_reference__is_branch(refname))
|
466
492
|
return not_a_local_branch(refname);
|
467
493
|
|
468
|
-
if ((error = git_repository_config__weakptr(&cfg, repo)) < 0
|
469
|
-
|
470
|
-
|
471
|
-
git_buf_sanitize(buf);
|
472
|
-
|
473
|
-
if ((error = retrieve_upstream_configuration(buf, cfg, refname, "branch.%s.remote")) < 0)
|
494
|
+
if ((error = git_repository_config__weakptr(&cfg, repo)) < 0 ||
|
495
|
+
(error = retrieve_upstream_configuration(out, cfg, refname, format)) < 0)
|
474
496
|
return error;
|
475
497
|
|
476
|
-
if (
|
477
|
-
git_error_set(GIT_ERROR_REFERENCE, "branch '%s' does not have an upstream
|
498
|
+
if (git_str_len(out) == 0) {
|
499
|
+
git_error_set(GIT_ERROR_REFERENCE, "branch '%s' does not have an upstream %s", refname, format_name);
|
478
500
|
error = GIT_ENOTFOUND;
|
479
|
-
git_buf_clear(buf);
|
480
501
|
}
|
481
502
|
|
482
503
|
return error;
|
483
504
|
}
|
484
505
|
|
485
|
-
int
|
506
|
+
int git_branch_upstream_remote(
|
507
|
+
git_buf *out,
|
508
|
+
git_repository *repo,
|
509
|
+
const char *refname)
|
510
|
+
{
|
511
|
+
GIT_BUF_WRAP_PRIVATE(out, git_branch__upstream_remote, repo, refname);
|
512
|
+
}
|
513
|
+
|
514
|
+
int git_branch__upstream_remote(
|
515
|
+
git_str *out,
|
516
|
+
git_repository *repo,
|
517
|
+
const char *refname)
|
518
|
+
{
|
519
|
+
return git_branch_upstream_with_format(out, repo, refname, "branch.%s.remote", "remote");
|
520
|
+
}
|
521
|
+
|
522
|
+
int git_branch_upstream_merge(
|
523
|
+
git_buf *out,
|
524
|
+
git_repository *repo,
|
525
|
+
const char *refname)
|
526
|
+
{
|
527
|
+
GIT_BUF_WRAP_PRIVATE(out, git_branch__upstream_merge, repo, refname);
|
528
|
+
}
|
529
|
+
|
530
|
+
int git_branch__upstream_merge(
|
531
|
+
git_str *out,
|
532
|
+
git_repository *repo,
|
533
|
+
const char *refname)
|
534
|
+
{
|
535
|
+
return git_branch_upstream_with_format(out, repo, refname, "branch.%s.merge", "merge");
|
536
|
+
}
|
537
|
+
|
538
|
+
int git_branch_remote_name(
|
539
|
+
git_buf *out,
|
540
|
+
git_repository *repo,
|
541
|
+
const char *refname)
|
542
|
+
{
|
543
|
+
GIT_BUF_WRAP_PRIVATE(out, git_branch__remote_name, repo, refname);
|
544
|
+
}
|
545
|
+
|
546
|
+
int git_branch__remote_name(
|
547
|
+
git_str *out,
|
548
|
+
git_repository *repo,
|
549
|
+
const char *refname)
|
486
550
|
{
|
487
551
|
git_strarray remote_list = {0};
|
488
552
|
size_t i;
|
@@ -491,9 +555,9 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
491
555
|
int error = 0;
|
492
556
|
char *remote_name = NULL;
|
493
557
|
|
494
|
-
|
495
|
-
|
496
|
-
|
558
|
+
GIT_ASSERT_ARG(out);
|
559
|
+
GIT_ASSERT_ARG(repo);
|
560
|
+
GIT_ASSERT_ARG(refname);
|
497
561
|
|
498
562
|
/* Verify that this is a remote branch */
|
499
563
|
if (!git_reference__is_remote(refname)) {
|
@@ -534,8 +598,8 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
534
598
|
}
|
535
599
|
|
536
600
|
if (remote_name) {
|
537
|
-
|
538
|
-
error =
|
601
|
+
git_str_clear(out);
|
602
|
+
error = git_str_puts(out, remote_name);
|
539
603
|
} else {
|
540
604
|
git_error_set(GIT_ERROR_REFERENCE,
|
541
605
|
"could not determine remote for '%s'", refname);
|
@@ -544,7 +608,7 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
|
|
544
608
|
|
545
609
|
cleanup:
|
546
610
|
if (error < 0)
|
547
|
-
|
611
|
+
git_str_dispose(out);
|
548
612
|
|
549
613
|
git_strarray_dispose(&remote_list);
|
550
614
|
return error;
|
@@ -555,49 +619,49 @@ int git_branch_upstream(
|
|
555
619
|
const git_reference *branch)
|
556
620
|
{
|
557
621
|
int error;
|
558
|
-
|
622
|
+
git_str tracking_name = GIT_STR_INIT;
|
559
623
|
|
560
|
-
if ((error =
|
624
|
+
if ((error = git_branch__upstream_name(&tracking_name,
|
561
625
|
git_reference_owner(branch), git_reference_name(branch))) < 0)
|
562
626
|
return error;
|
563
627
|
|
564
628
|
error = git_reference_lookup(
|
565
629
|
tracking_out,
|
566
630
|
git_reference_owner(branch),
|
567
|
-
|
631
|
+
git_str_cstr(&tracking_name));
|
568
632
|
|
569
|
-
|
633
|
+
git_str_dispose(&tracking_name);
|
570
634
|
return error;
|
571
635
|
}
|
572
636
|
|
573
637
|
static int unset_upstream(git_config *config, const char *shortname)
|
574
638
|
{
|
575
|
-
|
639
|
+
git_str buf = GIT_STR_INIT;
|
576
640
|
|
577
|
-
if (
|
641
|
+
if (git_str_printf(&buf, "branch.%s.remote", shortname) < 0)
|
578
642
|
return -1;
|
579
643
|
|
580
|
-
if (git_config_delete_entry(config,
|
644
|
+
if (git_config_delete_entry(config, git_str_cstr(&buf)) < 0)
|
581
645
|
goto on_error;
|
582
646
|
|
583
|
-
|
584
|
-
if (
|
647
|
+
git_str_clear(&buf);
|
648
|
+
if (git_str_printf(&buf, "branch.%s.merge", shortname) < 0)
|
585
649
|
goto on_error;
|
586
650
|
|
587
|
-
if (git_config_delete_entry(config,
|
651
|
+
if (git_config_delete_entry(config, git_str_cstr(&buf)) < 0)
|
588
652
|
goto on_error;
|
589
653
|
|
590
|
-
|
654
|
+
git_str_dispose(&buf);
|
591
655
|
return 0;
|
592
656
|
|
593
657
|
on_error:
|
594
|
-
|
658
|
+
git_str_dispose(&buf);
|
595
659
|
return -1;
|
596
660
|
}
|
597
661
|
|
598
662
|
int git_branch_set_upstream(git_reference *branch, const char *branch_name)
|
599
663
|
{
|
600
|
-
|
664
|
+
git_str key = GIT_STR_INIT, remote_name = GIT_STR_INIT, merge_refspec = GIT_STR_INIT;
|
601
665
|
git_reference *upstream;
|
602
666
|
git_repository *repo;
|
603
667
|
git_remote *remote = NULL;
|
@@ -639,31 +703,31 @@ int git_branch_set_upstream(git_reference *branch, const char *branch_name)
|
|
639
703
|
* name on the remote is and use that.
|
640
704
|
*/
|
641
705
|
if (local)
|
642
|
-
error =
|
706
|
+
error = git_str_puts(&remote_name, ".");
|
643
707
|
else
|
644
|
-
error =
|
708
|
+
error = git_branch__remote_name(&remote_name, repo, git_reference_name(upstream));
|
645
709
|
|
646
710
|
if (error < 0)
|
647
711
|
goto on_error;
|
648
712
|
|
649
|
-
/* Update the
|
650
|
-
if (
|
713
|
+
/* Update the upstream branch config with the new name */
|
714
|
+
if (git_str_printf(&key, "branch.%s.remote", shortname) < 0)
|
651
715
|
goto on_error;
|
652
716
|
|
653
|
-
if (git_config_set_string(config,
|
717
|
+
if (git_config_set_string(config, git_str_cstr(&key), git_str_cstr(&remote_name)) < 0)
|
654
718
|
goto on_error;
|
655
719
|
|
656
720
|
if (local) {
|
657
721
|
/* A local branch uses the upstream refname directly */
|
658
|
-
if (
|
722
|
+
if (git_str_puts(&merge_refspec, git_reference_name(upstream)) < 0)
|
659
723
|
goto on_error;
|
660
724
|
} else {
|
661
725
|
/* We transform the upstream branch name according to the remote's refspecs */
|
662
|
-
if (git_remote_lookup(&remote, repo,
|
726
|
+
if (git_remote_lookup(&remote, repo, git_str_cstr(&remote_name)) < 0)
|
663
727
|
goto on_error;
|
664
728
|
|
665
729
|
fetchspec = git_remote__matching_dst_refspec(remote, git_reference_name(upstream));
|
666
|
-
if (!fetchspec ||
|
730
|
+
if (!fetchspec || git_refspec__rtransform(&merge_refspec, fetchspec, git_reference_name(upstream)) < 0)
|
667
731
|
goto on_error;
|
668
732
|
|
669
733
|
git_remote_free(remote);
|
@@ -671,25 +735,25 @@ int git_branch_set_upstream(git_reference *branch, const char *branch_name)
|
|
671
735
|
}
|
672
736
|
|
673
737
|
/* Update the merge branch config with the refspec */
|
674
|
-
|
675
|
-
if (
|
738
|
+
git_str_clear(&key);
|
739
|
+
if (git_str_printf(&key, "branch.%s.merge", shortname) < 0)
|
676
740
|
goto on_error;
|
677
741
|
|
678
|
-
if (git_config_set_string(config,
|
742
|
+
if (git_config_set_string(config, git_str_cstr(&key), git_str_cstr(&merge_refspec)) < 0)
|
679
743
|
goto on_error;
|
680
744
|
|
681
745
|
git_reference_free(upstream);
|
682
|
-
|
683
|
-
|
684
|
-
|
746
|
+
git_str_dispose(&key);
|
747
|
+
git_str_dispose(&remote_name);
|
748
|
+
git_str_dispose(&merge_refspec);
|
685
749
|
|
686
750
|
return 0;
|
687
751
|
|
688
752
|
on_error:
|
689
753
|
git_reference_free(upstream);
|
690
|
-
|
691
|
-
|
692
|
-
|
754
|
+
git_str_dispose(&key);
|
755
|
+
git_str_dispose(&remote_name);
|
756
|
+
git_str_dispose(&merge_refspec);
|
693
757
|
git_remote_free(remote);
|
694
758
|
|
695
759
|
return -1;
|
@@ -702,7 +766,7 @@ int git_branch_is_head(
|
|
702
766
|
bool is_same = false;
|
703
767
|
int error;
|
704
768
|
|
705
|
-
|
769
|
+
GIT_ASSERT_ARG(branch);
|
706
770
|
|
707
771
|
if (!git_reference_is_branch(branch))
|
708
772
|
return false;
|
@@ -723,3 +787,32 @@ int git_branch_is_head(
|
|
723
787
|
|
724
788
|
return is_same;
|
725
789
|
}
|
790
|
+
|
791
|
+
int git_branch_name_is_valid(int *valid, const char *name)
|
792
|
+
{
|
793
|
+
git_str ref_name = GIT_STR_INIT;
|
794
|
+
int error = 0;
|
795
|
+
|
796
|
+
GIT_ASSERT(valid);
|
797
|
+
|
798
|
+
*valid = 0;
|
799
|
+
|
800
|
+
/*
|
801
|
+
* Discourage branch name starting with dash,
|
802
|
+
* https://github.com/git/git/commit/6348624010888b
|
803
|
+
* and discourage HEAD as branch name,
|
804
|
+
* https://github.com/git/git/commit/a625b092cc5994
|
805
|
+
*/
|
806
|
+
if (!name || name[0] == '-' || !git__strcmp(name, "HEAD"))
|
807
|
+
goto done;
|
808
|
+
|
809
|
+
if ((error = git_str_puts(&ref_name, GIT_REFS_HEADS_DIR)) < 0 ||
|
810
|
+
(error = git_str_puts(&ref_name, name)) < 0)
|
811
|
+
goto done;
|
812
|
+
|
813
|
+
error = git_reference_name_is_valid(valid, ref_name.ptr);
|
814
|
+
|
815
|
+
done:
|
816
|
+
git_str_dispose(&ref_name);
|
817
|
+
return error;
|
818
|
+
}
|
data/vendor/libgit2/src/branch.h
CHANGED
@@ -9,10 +9,22 @@
|
|
9
9
|
|
10
10
|
#include "common.h"
|
11
11
|
|
12
|
-
#include "
|
12
|
+
#include "str.h"
|
13
13
|
|
14
|
-
int
|
15
|
-
|
14
|
+
int git_branch__remote_name(
|
15
|
+
git_str *out,
|
16
|
+
git_repository *repo,
|
17
|
+
const char *refname);
|
18
|
+
int git_branch__upstream_remote(
|
19
|
+
git_str *out,
|
20
|
+
git_repository *repo,
|
21
|
+
const char *refname);
|
22
|
+
int git_branch__upstream_merge(
|
23
|
+
git_str *out,
|
24
|
+
git_repository *repo,
|
25
|
+
const char *refname);
|
26
|
+
int git_branch__upstream_name(
|
27
|
+
git_str *tracking_name,
|
16
28
|
git_repository *repo,
|
17
29
|
const char *canonical_branch_name);
|
18
30
|
|