rugged 0.28.5 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/ext/rugged/extconf.rb +3 -1
- data/ext/rugged/rugged.c +35 -31
- data/ext/rugged/rugged.h +13 -0
- data/ext/rugged/rugged_blob.c +11 -9
- data/ext/rugged/rugged_commit.c +18 -16
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_diff.c +4 -26
- data/ext/rugged/rugged_index.c +4 -2
- data/ext/rugged/rugged_note.c +5 -3
- data/ext/rugged/rugged_object.c +57 -10
- data/ext/rugged/rugged_rebase.c +3 -1
- data/ext/rugged/rugged_remote.c +32 -8
- data/ext/rugged/rugged_repo.c +232 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/commit.rb +17 -4
- data/lib/rugged/repository.rb +5 -6
- data/lib/rugged/submodule_collection.rb +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +57 -75
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/{Modules/AddCFlagIfSupported.cmake → AddCFlagIfSupported.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/EnableWarnings.cmake → EnableWarnings.cmake} +5 -1
- data/vendor/libgit2/cmake/{Modules/FindCoreFoundation.cmake → FindCoreFoundation.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindGSSAPI.cmake → FindGSSAPI.cmake} +1 -1
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/{Modules/FindHTTP_Parser.cmake → FindHTTP_Parser.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindIconv.cmake → FindIconv.cmake} +0 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/{Modules/FindPkgLibraries.cmake → FindPkgLibraries.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindSecurity.cmake → FindSecurity.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindStatNsec.cmake → FindStatNsec.cmake} +6 -0
- data/vendor/libgit2/cmake/{Modules/FindmbedTLS.cmake → FindmbedTLS.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/IdeSplitSources.cmake → IdeSplitSources.cmake} +0 -0
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +77 -0
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -0
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +48 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +120 -0
- data/vendor/libgit2/cmake/SelectHashes.cmake +61 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +4 -3
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +25 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +28 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1419 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +35 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +15 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/LICENCE +93 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9812 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +420 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -5
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/deps/zlib/deflate.c +1 -0
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +1 -1
- data/vendor/libgit2/include/git2/apply.h +24 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +4 -2
- data/vendor/libgit2/include/git2/blob.h +61 -13
- data/vendor/libgit2/include/git2/branch.h +74 -57
- data/vendor/libgit2/include/git2/buffer.h +20 -14
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +46 -14
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +2 -2
- data/vendor/libgit2/include/git2/commit.h +23 -1
- data/vendor/libgit2/include/git2/common.h +34 -8
- data/vendor/libgit2/include/git2/config.h +13 -13
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
- data/vendor/libgit2/include/git2/credential.h +314 -0
- data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
- data/vendor/libgit2/include/git2/deprecated.h +362 -4
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +17 -15
- data/vendor/libgit2/include/git2/errors.h +5 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +5 -5
- data/vendor/libgit2/include/git2/indexer.h +49 -4
- data/vendor/libgit2/include/git2/merge.h +6 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/object.h +2 -14
- data/vendor/libgit2/include/git2/odb.h +18 -22
- data/vendor/libgit2/include/git2/odb_backend.h +5 -4
- data/vendor/libgit2/include/git2/oid.h +11 -6
- data/vendor/libgit2/include/git2/pack.h +13 -2
- data/vendor/libgit2/include/git2/proxy.h +6 -4
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +22 -3
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +124 -58
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +25 -16
- data/vendor/libgit2/include/git2/strarray.h +6 -10
- data/vendor/libgit2/include/git2/submodule.h +20 -3
- data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
- data/vendor/libgit2/include/git2/sys/cred.h +15 -0
- data/vendor/libgit2/include/git2/sys/credential.h +90 -0
- data/vendor/libgit2/include/git2/sys/index.h +4 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
- data/vendor/libgit2/include/git2/sys/merge.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +164 -21
- data/vendor/libgit2/include/git2/sys/repository.h +17 -6
- data/vendor/libgit2/include/git2/sys/transport.h +4 -4
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -340
- data/vendor/libgit2/include/git2/tree.h +7 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +5 -5
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +147 -272
- data/vendor/libgit2/src/alloc.c +2 -14
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/apply.c +36 -16
- data/vendor/libgit2/src/assert_safe.h +58 -0
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +197 -99
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +48 -49
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +34 -15
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +27 -10
- data/vendor/libgit2/src/blob.c +92 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +68 -42
- data/vendor/libgit2/src/buffer.c +11 -3
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +34 -58
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +73 -86
- data/vendor/libgit2/src/cherrypick.c +9 -1
- data/vendor/libgit2/src/clone.c +130 -27
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +70 -22
- data/vendor/libgit2/src/commit.h +6 -0
- data/vendor/libgit2/src/commit_list.c +28 -76
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +4 -75
- data/vendor/libgit2/src/config.c +34 -47
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +42 -39
- data/vendor/libgit2/src/config_entries.c +76 -98
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +346 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +50 -30
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +207 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +26 -21
- data/vendor/libgit2/src/diff.c +53 -75
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +15 -11
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +36 -37
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +3 -4
- data/vendor/libgit2/src/diff_print.c +86 -71
- data/vendor/libgit2/src/diff_stats.c +13 -12
- data/vendor/libgit2/src/diff_tform.c +15 -16
- data/vendor/libgit2/src/errors.c +23 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +9 -2
- data/vendor/libgit2/src/fetchhead.c +9 -9
- data/vendor/libgit2/src/filebuf.c +1 -1
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +19 -11
- data/vendor/libgit2/src/{fileops.c → futils.c} +23 -20
- data/vendor/libgit2/src/{fileops.h → futils.h} +8 -8
- data/vendor/libgit2/src/global.c +3 -1
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +19 -21
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
- data/vendor/libgit2/src/{sha1_lookup.h → hash/sha1/collisiondetect.h} +8 -8
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
- data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
- data/vendor/libgit2/src/{refdb_fs.h → hash/sha1/openssl.h} +8 -8
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/idxmap.c +73 -69
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +123 -95
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +99 -78
- data/vendor/libgit2/src/integer.h +26 -4
- data/vendor/libgit2/src/iterator.c +36 -32
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +93 -57
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +5 -7
- data/vendor/libgit2/src/midx.c +418 -0
- data/vendor/libgit2/src/midx.h +83 -0
- data/vendor/libgit2/src/mwindow.c +144 -74
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +416 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -222
- data/vendor/libgit2/src/netops.h +1 -37
- data/vendor/libgit2/src/notes.c +8 -5
- data/vendor/libgit2/src/object.c +5 -4
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +54 -32
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +20 -13
- data/vendor/libgit2/src/odb_mempack.c +15 -24
- data/vendor/libgit2/src/odb_pack.c +4 -5
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +21 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +55 -52
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +160 -149
- data/vendor/libgit2/src/pack.h +32 -18
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +1 -1
- data/vendor/libgit2/src/patch_generate.c +2 -4
- data/vendor/libgit2/src/patch_parse.c +34 -11
- data/vendor/libgit2/src/path.c +47 -10
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +18 -17
- data/vendor/libgit2/src/pool.c +42 -32
- data/vendor/libgit2/src/pool.h +15 -7
- data/vendor/libgit2/src/posix.c +39 -16
- data/vendor/libgit2/src/posix.h +21 -1
- data/vendor/libgit2/src/proxy.c +9 -2
- data/vendor/libgit2/src/push.c +15 -7
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +89 -28
- data/vendor/libgit2/src/refdb.c +147 -0
- data/vendor/libgit2/src/refdb.h +69 -0
- data/vendor/libgit2/src/refdb_fs.c +230 -241
- data/vendor/libgit2/src/reflog.c +13 -19
- data/vendor/libgit2/src/refs.c +113 -217
- data/vendor/libgit2/src/refs.h +10 -21
- data/vendor/libgit2/src/refspec.c +57 -48
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +102 -79
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +322 -203
- data/vendor/libgit2/src/repository.h +49 -57
- data/vendor/libgit2/src/revert.c +8 -1
- data/vendor/libgit2/src/revparse.c +23 -23
- data/vendor/libgit2/src/revwalk.c +73 -37
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +22 -1
- data/vendor/libgit2/src/sortedcache.c +14 -29
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +49 -67
- data/vendor/libgit2/src/status.c +19 -11
- data/vendor/libgit2/src/strarray.c +63 -0
- data/vendor/libgit2/src/streams/openssl.c +66 -8
- data/vendor/libgit2/src/streams/registry.c +5 -3
- data/vendor/libgit2/src/streams/socket.c +2 -2
- data/vendor/libgit2/src/strmap.c +37 -84
- data/vendor/libgit2/src/strmap.h +105 -33
- data/vendor/libgit2/src/submodule.c +157 -130
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +4 -20
- data/vendor/libgit2/src/sysdir.h +0 -11
- data/vendor/libgit2/src/tag.c +12 -2
- data/vendor/libgit2/src/thread-utils.h +163 -40
- data/vendor/libgit2/src/trace.c +1 -1
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +5 -9
- data/vendor/libgit2/src/transports/auth.c +16 -15
- data/vendor/libgit2/src/transports/auth.h +18 -11
- data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
- data/vendor/libgit2/src/transports/credential.c +478 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +23 -8
- data/vendor/libgit2/src/transports/git.c +11 -16
- data/vendor/libgit2/src/transports/http.c +488 -1248
- data/vendor/libgit2/src/transports/http.h +4 -1
- data/vendor/libgit2/src/transports/httpclient.c +1552 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +12 -12
- data/vendor/libgit2/src/transports/smart.c +21 -21
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
- data/vendor/libgit2/src/transports/ssh.c +77 -59
- data/vendor/libgit2/src/transports/winhttp.c +368 -285
- data/vendor/libgit2/src/tree-cache.c +14 -7
- data/vendor/libgit2/src/tree.c +16 -26
- data/vendor/libgit2/src/unix/map.c +1 -1
- data/vendor/libgit2/src/unix/posix.h +16 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +75 -110
- data/vendor/libgit2/src/util.h +18 -23
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/git2.rc +18 -3
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +42 -5
- data/vendor/libgit2/src/win32/path_w32.h +15 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +117 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +4 -9
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +31 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -32
- data/vendor/libgit2/src/worktree.c +91 -50
- data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +5 -0
- data/vendor/libgit2/src/zstream.h +1 -0
- metadata +123 -53
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +0 -29
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +0 -96
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/COPYING +0 -502
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/sha1_lookup.c +0 -35
- data/vendor/libgit2/src/transports/cred.c +0 -390
@@ -0,0 +1,97 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#ifndef INCLUDE_regexp_h__
|
9
|
+
#define INCLUDE_regexp_h__
|
10
|
+
|
11
|
+
#include "common.h"
|
12
|
+
|
13
|
+
#if defined(GIT_REGEX_BUILTIN) || defined(GIT_REGEX_PCRE)
|
14
|
+
# include "pcre.h"
|
15
|
+
typedef pcre *git_regexp;
|
16
|
+
# define GIT_REGEX_INIT NULL
|
17
|
+
#elif defined(GIT_REGEX_PCRE2)
|
18
|
+
# define PCRE2_CODE_UNIT_WIDTH 8
|
19
|
+
# include <pcre2.h>
|
20
|
+
typedef pcre2_code *git_regexp;
|
21
|
+
# define GIT_REGEX_INIT NULL
|
22
|
+
#elif defined(GIT_REGEX_REGCOMP) || defined(GIT_REGEX_REGCOMP_L)
|
23
|
+
# include <regex.h>
|
24
|
+
typedef regex_t git_regexp;
|
25
|
+
# define GIT_REGEX_INIT { 0 }
|
26
|
+
#else
|
27
|
+
# error "No regex backend"
|
28
|
+
#endif
|
29
|
+
|
30
|
+
/** Options supported by @git_regexp_compile. */
|
31
|
+
typedef enum {
|
32
|
+
/** Enable case-insensitive matching */
|
33
|
+
GIT_REGEXP_ICASE = (1 << 0)
|
34
|
+
} git_regexp_flags_t;
|
35
|
+
|
36
|
+
/** Structure containing information about regular expression matching groups */
|
37
|
+
typedef struct {
|
38
|
+
/** Start of the given match. -1 if the group didn't match anything */
|
39
|
+
ssize_t start;
|
40
|
+
/** End of the given match. -1 if the group didn't match anything */
|
41
|
+
ssize_t end;
|
42
|
+
} git_regmatch;
|
43
|
+
|
44
|
+
/**
|
45
|
+
* Compile a regular expression. The compiled expression needs to
|
46
|
+
* be cleaned up afterwards with `git_regexp_dispose`.
|
47
|
+
*
|
48
|
+
* @param r Pointer to the storage where to initialize the regular expression.
|
49
|
+
* @param pattern The pattern that shall be compiled.
|
50
|
+
* @param flags Flags to alter how the pattern shall be handled.
|
51
|
+
* 0 for defaults, otherwise see @git_regexp_flags_t.
|
52
|
+
* @return 0 on success, otherwise a negative return value.
|
53
|
+
*/
|
54
|
+
int git_regexp_compile(git_regexp *r, const char *pattern, int flags);
|
55
|
+
|
56
|
+
/**
|
57
|
+
* Free memory associated with the regular expression
|
58
|
+
*
|
59
|
+
* @param r The regular expression structure to dispose.
|
60
|
+
*/
|
61
|
+
void git_regexp_dispose(git_regexp *r);
|
62
|
+
|
63
|
+
/**
|
64
|
+
* Test whether a given string matches a compiled regular
|
65
|
+
* expression.
|
66
|
+
*
|
67
|
+
* @param r Compiled regular expression.
|
68
|
+
* @param string String to match against the regular expression.
|
69
|
+
* @return 0 if the string matches, a negative error code
|
70
|
+
* otherwise. GIT_ENOTFOUND if no match was found,
|
71
|
+
* GIT_EINVALIDSPEC if the regular expression matching
|
72
|
+
* was invalid.
|
73
|
+
*/
|
74
|
+
int git_regexp_match(const git_regexp *r, const char *string);
|
75
|
+
|
76
|
+
/**
|
77
|
+
* Search for matches inside of a given string.
|
78
|
+
*
|
79
|
+
* Given a regular expression with capturing groups, this
|
80
|
+
* function will populate provided @git_regmatch structures with
|
81
|
+
* offsets for each of the given matches. Non-matching groups
|
82
|
+
* will have start and end values of the respective @git_regmatch
|
83
|
+
* structure set to -1.
|
84
|
+
*
|
85
|
+
* @param r Compiled regular expression.
|
86
|
+
* @param string String to match against the regular expression.
|
87
|
+
* @param nmatches Number of @git_regmatch structures provided by
|
88
|
+
* the user.
|
89
|
+
* @param matches Pointer to an array of @git_regmatch structures.
|
90
|
+
* @return 0 if the string matches, a negative error code
|
91
|
+
* otherwise. GIT_ENOTFOUND if no match was found,
|
92
|
+
* GIT_EINVALIDSPEC if the regular expression matching
|
93
|
+
* was invalid.
|
94
|
+
*/
|
95
|
+
int git_regexp_search(const git_regexp *r, const char *string, size_t nmatches, git_regmatch *matches);
|
96
|
+
|
97
|
+
#endif
|
data/vendor/libgit2/src/remote.c
CHANGED
@@ -110,12 +110,8 @@ static int write_add_refspec(git_repository *repo, const char *name, const char
|
|
110
110
|
if ((error = ensure_remote_name_is_valid(name)) < 0)
|
111
111
|
return error;
|
112
112
|
|
113
|
-
if ((error = git_refspec__parse(&spec, refspec, fetch)) < 0)
|
114
|
-
if (git_error_last()->klass != GIT_ERROR_NOMEMORY)
|
115
|
-
error = GIT_EINVALIDSPEC;
|
116
|
-
|
113
|
+
if ((error = git_refspec__parse(&spec, refspec, fetch)) < 0)
|
117
114
|
return error;
|
118
|
-
}
|
119
115
|
|
120
116
|
git_refspec__dispose(&spec);
|
121
117
|
|
@@ -136,35 +132,6 @@ cleanup:
|
|
136
132
|
return 0;
|
137
133
|
}
|
138
134
|
|
139
|
-
#if 0
|
140
|
-
/* We could export this as a helper */
|
141
|
-
static int get_check_cert(int *out, git_repository *repo)
|
142
|
-
{
|
143
|
-
git_config *cfg;
|
144
|
-
const char *val;
|
145
|
-
int error = 0;
|
146
|
-
|
147
|
-
assert(out && repo);
|
148
|
-
|
149
|
-
/* By default, we *DO* want to verify the certificate. */
|
150
|
-
*out = 1;
|
151
|
-
|
152
|
-
/* Go through the possible sources for SSL verification settings, from
|
153
|
-
* most specific to least specific. */
|
154
|
-
|
155
|
-
/* GIT_SSL_NO_VERIFY environment variable */
|
156
|
-
if ((val = p_getenv("GIT_SSL_NO_VERIFY")) != NULL)
|
157
|
-
return git_config_parse_bool(out, val);
|
158
|
-
|
159
|
-
/* http.sslVerify config setting */
|
160
|
-
if ((error = git_repository_config__weakptr(&cfg, repo)) < 0)
|
161
|
-
return error;
|
162
|
-
|
163
|
-
*out = git_config__get_bool_force(cfg, "http.sslverify", 1);
|
164
|
-
return 0;
|
165
|
-
}
|
166
|
-
#endif
|
167
|
-
|
168
135
|
static int canonicalize_url(git_buf *out, const char *in)
|
169
136
|
{
|
170
137
|
if (in == NULL || strlen(in) == 0) {
|
@@ -217,13 +184,20 @@ static int ensure_remote_doesnot_exist(git_repository *repo, const char *name)
|
|
217
184
|
return GIT_EEXISTS;
|
218
185
|
}
|
219
186
|
|
220
|
-
int
|
187
|
+
int git_remote_create_options_init(git_remote_create_options *opts, unsigned int version)
|
221
188
|
{
|
222
189
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
223
190
|
opts, version, git_remote_create_options, GIT_REMOTE_CREATE_OPTIONS_INIT);
|
224
191
|
return 0;
|
225
192
|
}
|
226
193
|
|
194
|
+
#ifndef GIT_DEPRECATE_HARD
|
195
|
+
int git_remote_create_init_options(git_remote_create_options *opts, unsigned int version)
|
196
|
+
{
|
197
|
+
return git_remote_create_options_init(opts, version);
|
198
|
+
}
|
199
|
+
#endif
|
200
|
+
|
227
201
|
int git_remote_create_with_opts(git_remote **out, const char *url, const git_remote_create_options *opts)
|
228
202
|
{
|
229
203
|
git_remote *remote = NULL;
|
@@ -670,24 +644,47 @@ int git_remote_set_pushurl(git_repository *repo, const char *remote, const char*
|
|
670
644
|
return set_url(repo, remote, CONFIG_PUSHURL_FMT, url);
|
671
645
|
}
|
672
646
|
|
673
|
-
|
647
|
+
static int resolve_url(git_buf *resolved_url, const char *url, int direction, const git_remote_callbacks *callbacks)
|
674
648
|
{
|
675
|
-
|
649
|
+
int status;
|
650
|
+
|
651
|
+
if (callbacks && callbacks->resolve_url) {
|
652
|
+
git_buf_clear(resolved_url);
|
653
|
+
status = callbacks->resolve_url(resolved_url, url, direction, callbacks->payload);
|
654
|
+
if (status != GIT_PASSTHROUGH) {
|
655
|
+
git_error_set_after_callback_function(status, "git_resolve_url_cb");
|
656
|
+
git_buf_sanitize(resolved_url);
|
657
|
+
return status;
|
658
|
+
}
|
659
|
+
}
|
676
660
|
|
661
|
+
return git_buf_sets(resolved_url, url);
|
662
|
+
}
|
663
|
+
|
664
|
+
int git_remote__urlfordirection(git_buf *url_out, struct git_remote *remote, int direction, const git_remote_callbacks *callbacks)
|
665
|
+
{
|
666
|
+
const char *url = NULL;
|
667
|
+
|
668
|
+
assert(remote);
|
677
669
|
assert(direction == GIT_DIRECTION_FETCH || direction == GIT_DIRECTION_PUSH);
|
678
670
|
|
679
671
|
if (direction == GIT_DIRECTION_FETCH) {
|
680
|
-
|
672
|
+
url = remote->url;
|
673
|
+
} else if (direction == GIT_DIRECTION_PUSH) {
|
674
|
+
url = remote->pushurl ? remote->pushurl : remote->url;
|
681
675
|
}
|
682
676
|
|
683
|
-
if (
|
684
|
-
|
677
|
+
if (!url) {
|
678
|
+
git_error_set(GIT_ERROR_INVALID,
|
679
|
+
"malformed remote '%s' - missing %s URL",
|
680
|
+
remote->name ? remote->name : "(anonymous)",
|
681
|
+
direction == GIT_DIRECTION_FETCH ? "fetch" : "push");
|
682
|
+
return GIT_EINVALID;
|
685
683
|
}
|
686
|
-
|
687
|
-
return NULL;
|
684
|
+
return resolve_url(url_out, url, direction, callbacks);
|
688
685
|
}
|
689
686
|
|
690
|
-
int
|
687
|
+
static int remote_transport_set_callbacks(git_transport *t, const git_remote_callbacks *cbs)
|
691
688
|
{
|
692
689
|
if (!t->set_callbacks || !cbs)
|
693
690
|
return 0;
|
@@ -707,11 +704,11 @@ static int set_transport_custom_headers(git_transport *t, const git_strarray *cu
|
|
707
704
|
int git_remote__connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_remote_connection_opts *conn)
|
708
705
|
{
|
709
706
|
git_transport *t;
|
710
|
-
|
707
|
+
git_buf url = GIT_BUF_INIT;
|
711
708
|
int flags = GIT_TRANSPORTFLAGS_NONE;
|
712
709
|
int error;
|
713
710
|
void *payload = NULL;
|
714
|
-
|
711
|
+
git_credential_acquire_cb credentials = NULL;
|
715
712
|
git_transport_cb transport = NULL;
|
716
713
|
|
717
714
|
assert(remote);
|
@@ -728,39 +725,38 @@ int git_remote__connect(git_remote *remote, git_direction direction, const git_r
|
|
728
725
|
|
729
726
|
t = remote->transport;
|
730
727
|
|
731
|
-
|
732
|
-
|
733
|
-
git_error_set(GIT_ERROR_INVALID,
|
734
|
-
"Malformed remote '%s' - missing %s URL",
|
735
|
-
remote->name ? remote->name : "(anonymous)",
|
736
|
-
direction == GIT_DIRECTION_FETCH ? "fetch" : "push");
|
737
|
-
return -1;
|
738
|
-
}
|
728
|
+
if ((error = git_remote__urlfordirection(&url, remote, direction, callbacks)) < 0)
|
729
|
+
goto on_error;
|
739
730
|
|
740
731
|
/* If we don't have a transport object yet, and the caller specified a
|
741
732
|
* custom transport factory, use that */
|
742
733
|
if (!t && transport &&
|
743
734
|
(error = transport(&t, remote, payload)) < 0)
|
744
|
-
|
735
|
+
goto on_error;
|
745
736
|
|
746
737
|
/* If we still don't have a transport, then use the global
|
747
738
|
* transport registrations which map URI schemes to transport factories */
|
748
|
-
if (!t && (error = git_transport_new(&t, remote, url)) < 0)
|
749
|
-
|
739
|
+
if (!t && (error = git_transport_new(&t, remote, url.ptr)) < 0)
|
740
|
+
goto on_error;
|
750
741
|
|
751
742
|
if ((error = set_transport_custom_headers(t, conn->custom_headers)) != 0)
|
752
743
|
goto on_error;
|
753
744
|
|
754
|
-
if ((error =
|
755
|
-
(error = t->connect(t, url, credentials, payload, conn->proxy, direction, flags)) != 0)
|
745
|
+
if ((error = remote_transport_set_callbacks(t, callbacks)) < 0 ||
|
746
|
+
(error = t->connect(t, url.ptr, credentials, payload, conn->proxy, direction, flags)) != 0)
|
756
747
|
goto on_error;
|
757
748
|
|
758
749
|
remote->transport = t;
|
759
750
|
|
751
|
+
git_buf_dispose(&url);
|
752
|
+
|
760
753
|
return 0;
|
761
754
|
|
762
755
|
on_error:
|
763
|
-
|
756
|
+
if (t)
|
757
|
+
t->free(t);
|
758
|
+
|
759
|
+
git_buf_dispose(&url);
|
764
760
|
|
765
761
|
if (t == remote->transport)
|
766
762
|
remote->transport = NULL;
|
@@ -1116,7 +1112,7 @@ static int remote_head_for_ref(git_remote_head **out, git_remote *remote, git_re
|
|
1116
1112
|
git_reference *resolved_ref = NULL;
|
1117
1113
|
git_buf remote_name = GIT_BUF_INIT;
|
1118
1114
|
git_config *config = NULL;
|
1119
|
-
const char *ref_name;
|
1115
|
+
const char *ref_name = NULL;
|
1120
1116
|
int error = 0, update;
|
1121
1117
|
|
1122
1118
|
assert(out && spec && ref);
|
@@ -1129,10 +1125,20 @@ static int remote_head_for_ref(git_remote_head **out, git_remote *remote, git_re
|
|
1129
1125
|
if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
|
1130
1126
|
ref_name = git_reference_symbolic_target(ref);
|
1131
1127
|
error = 0;
|
1132
|
-
} else {
|
1128
|
+
} else if (resolved_ref) {
|
1133
1129
|
ref_name = git_reference_name(resolved_ref);
|
1134
1130
|
}
|
1135
1131
|
|
1132
|
+
/*
|
1133
|
+
* The ref name may be unresolvable - perhaps it's pointing to
|
1134
|
+
* something invalid. In this case, there is no remote head for
|
1135
|
+
* this ref.
|
1136
|
+
*/
|
1137
|
+
if (!ref_name) {
|
1138
|
+
error = 0;
|
1139
|
+
goto cleanup;
|
1140
|
+
}
|
1141
|
+
|
1136
1142
|
if ((error = ref_to_update(&update, &remote_name, remote, spec, ref_name)) < 0)
|
1137
1143
|
goto cleanup;
|
1138
1144
|
|
@@ -1239,7 +1245,7 @@ static int prune_candidates(git_vector *candidates, git_remote *remote)
|
|
1239
1245
|
}
|
1240
1246
|
|
1241
1247
|
out:
|
1242
|
-
|
1248
|
+
git_strarray_dispose(&arr);
|
1243
1249
|
return error;
|
1244
1250
|
}
|
1245
1251
|
|
@@ -1678,20 +1684,24 @@ int git_remote_connected(const git_remote *remote)
|
|
1678
1684
|
return remote->transport->is_connected(remote->transport);
|
1679
1685
|
}
|
1680
1686
|
|
1681
|
-
|
1687
|
+
int git_remote_stop(git_remote *remote)
|
1682
1688
|
{
|
1683
1689
|
assert(remote);
|
1684
1690
|
|
1685
1691
|
if (remote->transport && remote->transport->cancel)
|
1686
1692
|
remote->transport->cancel(remote->transport);
|
1693
|
+
|
1694
|
+
return 0;
|
1687
1695
|
}
|
1688
1696
|
|
1689
|
-
|
1697
|
+
int git_remote_disconnect(git_remote *remote)
|
1690
1698
|
{
|
1691
1699
|
assert(remote);
|
1692
1700
|
|
1693
1701
|
if (git_remote_connected(remote))
|
1694
1702
|
remote->transport->close(remote->transport);
|
1703
|
+
|
1704
|
+
return 0;
|
1695
1705
|
}
|
1696
1706
|
|
1697
1707
|
void git_remote_free(git_remote *remote)
|
@@ -1770,7 +1780,7 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo)
|
|
1770
1780
|
return 0;
|
1771
1781
|
}
|
1772
1782
|
|
1773
|
-
const
|
1783
|
+
const git_indexer_progress *git_remote_stats(git_remote *remote)
|
1774
1784
|
{
|
1775
1785
|
assert(remote);
|
1776
1786
|
return &remote->stats;
|
@@ -2371,29 +2381,36 @@ int git_remote_default_branch(git_buf *out, git_remote *remote)
|
|
2371
2381
|
const git_remote_head *guess = NULL;
|
2372
2382
|
const git_oid *head_id;
|
2373
2383
|
size_t heads_len, i;
|
2384
|
+
git_buf local_default = GIT_BUF_INIT;
|
2374
2385
|
int error;
|
2375
2386
|
|
2376
2387
|
assert(out);
|
2377
2388
|
|
2378
2389
|
if ((error = git_remote_ls(&heads, &heads_len, remote)) < 0)
|
2379
|
-
|
2390
|
+
goto done;
|
2380
2391
|
|
2381
|
-
if (heads_len == 0)
|
2382
|
-
|
2383
|
-
|
2384
|
-
|
2385
|
-
return GIT_ENOTFOUND;
|
2392
|
+
if (heads_len == 0 || strcmp(heads[0]->name, GIT_HEAD_FILE)) {
|
2393
|
+
error = GIT_ENOTFOUND;
|
2394
|
+
goto done;
|
2395
|
+
}
|
2386
2396
|
|
2387
2397
|
git_buf_sanitize(out);
|
2398
|
+
|
2388
2399
|
/* the first one must be HEAD so if that has the symref info, we're done */
|
2389
|
-
if (heads[0]->symref_target)
|
2390
|
-
|
2400
|
+
if (heads[0]->symref_target) {
|
2401
|
+
error = git_buf_puts(out, heads[0]->symref_target);
|
2402
|
+
goto done;
|
2403
|
+
}
|
2391
2404
|
|
2392
2405
|
/*
|
2393
2406
|
* If there's no symref information, we have to look over them
|
2394
|
-
* and guess. We return the first match unless the
|
2395
|
-
* branch is a candidate. Then we return the
|
2407
|
+
* and guess. We return the first match unless the default
|
2408
|
+
* branch is a candidate. Then we return the default branch.
|
2396
2409
|
*/
|
2410
|
+
|
2411
|
+
if ((error = git_repository_initialbranch(&local_default, remote->repo)) < 0)
|
2412
|
+
goto done;
|
2413
|
+
|
2397
2414
|
head_id = &heads[0]->oid;
|
2398
2415
|
|
2399
2416
|
for (i = 1; i < heads_len; i++) {
|
@@ -2408,16 +2425,22 @@ int git_remote_default_branch(git_buf *out, git_remote *remote)
|
|
2408
2425
|
continue;
|
2409
2426
|
}
|
2410
2427
|
|
2411
|
-
if (!git__strcmp(
|
2428
|
+
if (!git__strcmp(local_default.ptr, heads[i]->name)) {
|
2412
2429
|
guess = heads[i];
|
2413
2430
|
break;
|
2414
2431
|
}
|
2415
2432
|
}
|
2416
2433
|
|
2417
|
-
if (!guess)
|
2418
|
-
|
2434
|
+
if (!guess) {
|
2435
|
+
error = GIT_ENOTFOUND;
|
2436
|
+
goto done;
|
2437
|
+
}
|
2419
2438
|
|
2420
|
-
|
2439
|
+
error = git_buf_puts(out, guess->name);
|
2440
|
+
|
2441
|
+
done:
|
2442
|
+
git_buf_dispose(&local_default);
|
2443
|
+
return error;
|
2421
2444
|
}
|
2422
2445
|
|
2423
2446
|
int git_remote_upload(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts)
|
data/vendor/libgit2/src/remote.h
CHANGED
@@ -29,7 +29,7 @@ struct git_remote {
|
|
29
29
|
git_transport *transport;
|
30
30
|
git_repository *repo;
|
31
31
|
git_push *push;
|
32
|
-
|
32
|
+
git_indexer_progress stats;
|
33
33
|
unsigned int need_pack;
|
34
34
|
git_remote_autotag_option_t download_tags;
|
35
35
|
int prune_refs;
|
@@ -45,7 +45,7 @@ typedef struct git_remote_connection_opts {
|
|
45
45
|
|
46
46
|
int git_remote__connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_remote_connection_opts *conn);
|
47
47
|
|
48
|
-
|
48
|
+
int git_remote__urlfordirection(git_buf *url_out, struct git_remote *remote, int direction, const git_remote_callbacks *callbacks);
|
49
49
|
int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_url);
|
50
50
|
|
51
51
|
git_refspec *git_remote__matching_refspec(git_remote *remote, const char *refname);
|