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
@@ -9,6 +9,7 @@
|
|
9
9
|
|
10
10
|
#include "common.h"
|
11
11
|
#include "types.h"
|
12
|
+
#include "indexer.h"
|
12
13
|
|
13
14
|
/**
|
14
15
|
* @file git2/backend.h
|
@@ -86,8 +87,8 @@ struct git_odb_stream {
|
|
86
87
|
unsigned int mode;
|
87
88
|
void *hash_ctx;
|
88
89
|
|
89
|
-
|
90
|
-
|
90
|
+
git_object_size_t declared_size;
|
91
|
+
git_object_size_t received_bytes;
|
91
92
|
|
92
93
|
/**
|
93
94
|
* Write at most `len` bytes into `buffer` and advance the stream.
|
@@ -124,8 +125,8 @@ struct git_odb_stream {
|
|
124
125
|
struct git_odb_writepack {
|
125
126
|
git_odb_backend *backend;
|
126
127
|
|
127
|
-
int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size,
|
128
|
-
int GIT_CALLBACK(commit)(git_odb_writepack *writepack,
|
128
|
+
int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_indexer_progress *stats);
|
129
|
+
int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_indexer_progress *stats);
|
129
130
|
void GIT_CALLBACK(free)(git_odb_writepack *writepack);
|
130
131
|
};
|
131
132
|
|
@@ -73,8 +73,9 @@ GIT_EXTERN(int) git_oid_fromstrn(git_oid *out, const char *str, size_t length);
|
|
73
73
|
*
|
74
74
|
* @param out oid structure the result is written into.
|
75
75
|
* @param raw the raw input bytes to be copied.
|
76
|
+
* @return 0 on success or error code
|
76
77
|
*/
|
77
|
-
GIT_EXTERN(
|
78
|
+
GIT_EXTERN(int) git_oid_fromraw(git_oid *out, const unsigned char *raw);
|
78
79
|
|
79
80
|
/**
|
80
81
|
* Format a git_oid into a hex string.
|
@@ -85,8 +86,9 @@ GIT_EXTERN(void) git_oid_fromraw(git_oid *out, const unsigned char *raw);
|
|
85
86
|
* oid digits are written; a '\\0' terminator must be added
|
86
87
|
* by the caller if it is required.
|
87
88
|
* @param id oid structure to format.
|
89
|
+
* @return 0 on success or error code
|
88
90
|
*/
|
89
|
-
GIT_EXTERN(
|
91
|
+
GIT_EXTERN(int) git_oid_fmt(char *out, const git_oid *id);
|
90
92
|
|
91
93
|
/**
|
92
94
|
* Format a git_oid into a partial hex string.
|
@@ -96,8 +98,9 @@ GIT_EXTERN(void) git_oid_fmt(char *out, const git_oid *id);
|
|
96
98
|
* will be zeroed; if not, a '\0' terminator is NOT added.
|
97
99
|
* @param n number of characters to write into out string
|
98
100
|
* @param id oid structure to format.
|
101
|
+
* @return 0 on success or error code
|
99
102
|
*/
|
100
|
-
GIT_EXTERN(
|
103
|
+
GIT_EXTERN(int) git_oid_nfmt(char *out, size_t n, const git_oid *id);
|
101
104
|
|
102
105
|
/**
|
103
106
|
* Format a git_oid into a loose-object path string.
|
@@ -111,8 +114,9 @@ GIT_EXTERN(void) git_oid_nfmt(char *out, size_t n, const git_oid *id);
|
|
111
114
|
* oid digits are written; a '\\0' terminator must be added
|
112
115
|
* by the caller if it is required.
|
113
116
|
* @param id oid structure to format.
|
117
|
+
* @return 0 on success, non-zero callback return value, or error code
|
114
118
|
*/
|
115
|
-
GIT_EXTERN(
|
119
|
+
GIT_EXTERN(int) git_oid_pathfmt(char *out, const git_oid *id);
|
116
120
|
|
117
121
|
/**
|
118
122
|
* Format a git_oid into a statically allocated c-string.
|
@@ -151,8 +155,9 @@ GIT_EXTERN(char *) git_oid_tostr(char *out, size_t n, const git_oid *id);
|
|
151
155
|
*
|
152
156
|
* @param out oid structure the result is written into.
|
153
157
|
* @param src oid structure to copy from.
|
158
|
+
* @return 0 on success or error code
|
154
159
|
*/
|
155
|
-
GIT_EXTERN(
|
160
|
+
GIT_EXTERN(int) git_oid_cpy(git_oid *out, const git_oid *src);
|
156
161
|
|
157
162
|
/**
|
158
163
|
* Compare two oid structures.
|
@@ -207,7 +212,7 @@ GIT_EXTERN(int) git_oid_strcmp(const git_oid *id, const char *str);
|
|
207
212
|
*
|
208
213
|
* @return 1 if all zeros, 0 otherwise.
|
209
214
|
*/
|
210
|
-
GIT_EXTERN(int)
|
215
|
+
GIT_EXTERN(int) git_oid_is_zero(const git_oid *id);
|
211
216
|
|
212
217
|
/**
|
213
218
|
* OID Shortener object
|
@@ -9,6 +9,7 @@
|
|
9
9
|
|
10
10
|
#include "common.h"
|
11
11
|
#include "oid.h"
|
12
|
+
#include "indexer.h"
|
12
13
|
|
13
14
|
/**
|
14
15
|
* @file git2/pack.h
|
@@ -154,7 +155,7 @@ GIT_EXTERN(int) git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb);
|
|
154
155
|
* Write the new pack and corresponding index file to path.
|
155
156
|
*
|
156
157
|
* @param pb The packbuilder
|
157
|
-
* @param path to the directory where the packfile and index should be stored
|
158
|
+
* @param path Path to the directory where the packfile and index should be stored, or NULL for default location
|
158
159
|
* @param mode permissions to use creating a packfile or 0 for defaults
|
159
160
|
* @param progress_cb function to call with progress information from the indexer (optional)
|
160
161
|
* @param progress_cb_payload payload for the progress callback (optional)
|
@@ -165,7 +166,7 @@ GIT_EXTERN(int) git_packbuilder_write(
|
|
165
166
|
git_packbuilder *pb,
|
166
167
|
const char *path,
|
167
168
|
unsigned int mode,
|
168
|
-
|
169
|
+
git_indexer_progress_cb progress_cb,
|
169
170
|
void *progress_cb_payload);
|
170
171
|
|
171
172
|
/**
|
@@ -178,6 +179,16 @@ GIT_EXTERN(int) git_packbuilder_write(
|
|
178
179
|
*/
|
179
180
|
GIT_EXTERN(const git_oid *) git_packbuilder_hash(git_packbuilder *pb);
|
180
181
|
|
182
|
+
/**
|
183
|
+
* Callback used to iterate over packed objects
|
184
|
+
*
|
185
|
+
* @see git_packbuilder_foreach
|
186
|
+
*
|
187
|
+
* @param buf A pointer to the object's data
|
188
|
+
* @param size The size of the underlying object
|
189
|
+
* @param payload Payload passed to git_packbuilder_foreach
|
190
|
+
* @return non-zero to terminate the iteration
|
191
|
+
*/
|
181
192
|
typedef int GIT_CALLBACK(git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
|
182
193
|
|
183
194
|
/**
|
@@ -8,7 +8,9 @@
|
|
8
8
|
#define INCLUDE_git_proxy_h__
|
9
9
|
|
10
10
|
#include "common.h"
|
11
|
-
|
11
|
+
|
12
|
+
#include "cert.h"
|
13
|
+
#include "credential.h"
|
12
14
|
|
13
15
|
GIT_BEGIN_DECL
|
14
16
|
|
@@ -59,7 +61,7 @@ typedef struct {
|
|
59
61
|
* Returning GIT_PASSTHROUGH will make libgit2 behave as
|
60
62
|
* though this field isn't set.
|
61
63
|
*/
|
62
|
-
|
64
|
+
git_credential_acquire_cb credentials;
|
63
65
|
|
64
66
|
/**
|
65
67
|
* If cert verification fails, this will be called to let the
|
@@ -67,7 +69,7 @@ typedef struct {
|
|
67
69
|
* connection to proceed. Returns 0 to allow the connection
|
68
70
|
* or a negative value to indicate an error.
|
69
71
|
*/
|
70
|
-
|
72
|
+
git_transport_certificate_check_cb certificate_check;
|
71
73
|
|
72
74
|
/**
|
73
75
|
* Payload to be provided to the credentials and certificate
|
@@ -89,7 +91,7 @@ typedef struct {
|
|
89
91
|
* @param version The struct version; pass `GIT_PROXY_OPTIONS_VERSION`.
|
90
92
|
* @return Zero on success; -1 on failure.
|
91
93
|
*/
|
92
|
-
GIT_EXTERN(int)
|
94
|
+
GIT_EXTERN(int) git_proxy_options_init(git_proxy_options *opts, unsigned int version);
|
93
95
|
|
94
96
|
GIT_END_DECL
|
95
97
|
|
@@ -13,6 +13,7 @@
|
|
13
13
|
#include "annotated_commit.h"
|
14
14
|
#include "merge.h"
|
15
15
|
#include "checkout.h"
|
16
|
+
#include "commit.h"
|
16
17
|
|
17
18
|
/**
|
18
19
|
* @file git2/rebase.h
|
@@ -72,6 +73,21 @@ typedef struct {
|
|
72
73
|
* `abort` to match git semantics.
|
73
74
|
*/
|
74
75
|
git_checkout_options checkout_options;
|
76
|
+
|
77
|
+
/**
|
78
|
+
* If provided, this will be called with the commit content, allowing
|
79
|
+
* a signature to be added to the rebase commit. Can be skipped with
|
80
|
+
* GIT_PASSTHROUGH. If GIT_PASSTHROUGH is returned, a commit will be made
|
81
|
+
* without a signature.
|
82
|
+
* This field is only used when performing git_rebase_commit.
|
83
|
+
*/
|
84
|
+
git_commit_signing_cb signing_cb;
|
85
|
+
|
86
|
+
/**
|
87
|
+
* This will be passed to each of the callbacks in this struct
|
88
|
+
* as the last parameter.
|
89
|
+
*/
|
90
|
+
void *payload;
|
75
91
|
} git_rebase_options;
|
76
92
|
|
77
93
|
/**
|
@@ -118,7 +134,7 @@ typedef enum {
|
|
118
134
|
#define GIT_REBASE_OPTIONS_VERSION 1
|
119
135
|
#define GIT_REBASE_OPTIONS_INIT \
|
120
136
|
{ GIT_REBASE_OPTIONS_VERSION, 0, 0, NULL, GIT_MERGE_OPTIONS_INIT, \
|
121
|
-
GIT_CHECKOUT_OPTIONS_INIT}
|
137
|
+
GIT_CHECKOUT_OPTIONS_INIT, NULL, NULL }
|
122
138
|
|
123
139
|
/** Indicates that a rebase operation is not (yet) in progress. */
|
124
140
|
#define GIT_REBASE_NO_OPERATION SIZE_MAX
|
@@ -156,7 +172,7 @@ typedef struct {
|
|
156
172
|
* @param version The struct version; pass `GIT_REBASE_OPTIONS_VERSION`.
|
157
173
|
* @return Zero on success; -1 on failure.
|
158
174
|
*/
|
159
|
-
GIT_EXTERN(int)
|
175
|
+
GIT_EXTERN(int) git_rebase_options_init(
|
160
176
|
git_rebase_options *opts,
|
161
177
|
unsigned int version);
|
162
178
|
|
@@ -199,6 +215,34 @@ GIT_EXTERN(int) git_rebase_open(
|
|
199
215
|
git_repository *repo,
|
200
216
|
const git_rebase_options *opts);
|
201
217
|
|
218
|
+
/**
|
219
|
+
* Gets the original `HEAD` ref name for merge rebases.
|
220
|
+
*
|
221
|
+
* @return The original `HEAD` ref name
|
222
|
+
*/
|
223
|
+
GIT_EXTERN(const char *) git_rebase_orig_head_name(git_rebase *rebase);
|
224
|
+
|
225
|
+
/**
|
226
|
+
* Gets the original `HEAD` id for merge rebases.
|
227
|
+
*
|
228
|
+
* @return The original `HEAD` id
|
229
|
+
*/
|
230
|
+
GIT_EXTERN(const git_oid *) git_rebase_orig_head_id(git_rebase *rebase);
|
231
|
+
|
232
|
+
/**
|
233
|
+
* Gets the `onto` ref name for merge rebases.
|
234
|
+
*
|
235
|
+
* @return The `onto` ref name
|
236
|
+
*/
|
237
|
+
GIT_EXTERN(const char *) git_rebase_onto_name(git_rebase *rebase);
|
238
|
+
|
239
|
+
/**
|
240
|
+
* Gets the `onto` id for merge rebases.
|
241
|
+
*
|
242
|
+
* @return The `onto` id
|
243
|
+
*/
|
244
|
+
GIT_EXTERN(const git_oid *) git_rebase_onto_id(git_rebase *rebase);
|
245
|
+
|
202
246
|
/**
|
203
247
|
* Gets the count of rebase operations that are to be applied.
|
204
248
|
*
|
@@ -169,7 +169,7 @@ GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repositor
|
|
169
169
|
*
|
170
170
|
* The message for the reflog will be ignored if the reference does
|
171
171
|
* not belong in the standard set (HEAD, branches and remote-tracking
|
172
|
-
* branches) and
|
172
|
+
* branches) and it does not have a reflog.
|
173
173
|
*
|
174
174
|
* @param out Pointer to the newly created reference
|
175
175
|
* @param repo Repository where that reference will live
|
@@ -206,7 +206,7 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo,
|
|
206
206
|
*
|
207
207
|
* The message for the reflog will be ignored if the reference does
|
208
208
|
* not belong in the standard set (HEAD, branches and remote-tracking
|
209
|
-
* branches) and
|
209
|
+
* branches) and it does not have a reflog.
|
210
210
|
*
|
211
211
|
* It will return GIT_EMODIFIED if the reference's value at the time
|
212
212
|
* of updating does not match the one passed through `current_id`
|
@@ -318,7 +318,7 @@ GIT_EXTERN(git_repository *) git_reference_owner(const git_reference *ref);
|
|
318
318
|
*
|
319
319
|
* The message for the reflog will be ignored if the reference does
|
320
320
|
* not belong in the standard set (HEAD, branches and remote-tracking
|
321
|
-
* branches) and
|
321
|
+
* branches) and it does not have a reflog.
|
322
322
|
*
|
323
323
|
* @param out Pointer to the newly created reference
|
324
324
|
* @param ref The reference
|
@@ -422,7 +422,26 @@ GIT_EXTERN(int) git_reference_remove(git_repository *repo, const char *name);
|
|
422
422
|
*/
|
423
423
|
GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo);
|
424
424
|
|
425
|
+
/**
|
426
|
+
* Callback used to iterate over references
|
427
|
+
*
|
428
|
+
* @see git_reference_foreach
|
429
|
+
*
|
430
|
+
* @param reference The reference object
|
431
|
+
* @param payload Payload passed to git_reference_foreach
|
432
|
+
* @return non-zero to terminate the iteration
|
433
|
+
*/
|
425
434
|
typedef int GIT_CALLBACK(git_reference_foreach_cb)(git_reference *reference, void *payload);
|
435
|
+
|
436
|
+
/**
|
437
|
+
* Callback used to iterate over reference names
|
438
|
+
*
|
439
|
+
* @see git_reference_foreach_name
|
440
|
+
*
|
441
|
+
* @param name The reference name
|
442
|
+
* @param payload Payload passed to git_reference_foreach_name
|
443
|
+
* @return non-zero to terminate the iteration
|
444
|
+
*/
|
426
445
|
typedef int GIT_CALLBACK(git_reference_foreach_name_cb)(const char *name, void *payload);
|
427
446
|
|
428
447
|
/**
|
@@ -56,7 +56,7 @@ typedef enum {
|
|
56
56
|
* Remote creation options structure
|
57
57
|
*
|
58
58
|
* Initialize with `GIT_REMOTE_CREATE_OPTIONS_INIT`. Alternatively, you can
|
59
|
-
* use `
|
59
|
+
* use `git_remote_create_options_init`.
|
60
60
|
*
|
61
61
|
*/
|
62
62
|
typedef struct git_remote_create_options {
|
@@ -94,7 +94,7 @@ typedef struct git_remote_create_options {
|
|
94
94
|
* @param version The struct version; pass `GIT_REMOTE_CREATE_OPTIONS_VERSION`.
|
95
95
|
* @return Zero on success; -1 on failure.
|
96
96
|
*/
|
97
|
-
GIT_EXTERN(int)
|
97
|
+
GIT_EXTERN(int) git_remote_create_options_init(
|
98
98
|
git_remote_create_options *opts,
|
99
99
|
unsigned int version);
|
100
100
|
|
@@ -378,8 +378,9 @@ GIT_EXTERN(int) git_remote_connected(const git_remote *remote);
|
|
378
378
|
* the operation has been cancelled and if so stops the operation.
|
379
379
|
*
|
380
380
|
* @param remote the remote
|
381
|
+
* @return 0 on success, or an error code
|
381
382
|
*/
|
382
|
-
GIT_EXTERN(
|
383
|
+
GIT_EXTERN(int) git_remote_stop(git_remote *remote);
|
383
384
|
|
384
385
|
/**
|
385
386
|
* Disconnect from the remote
|
@@ -387,8 +388,9 @@ GIT_EXTERN(void) git_remote_stop(git_remote *remote);
|
|
387
388
|
* Close the connection to the remote.
|
388
389
|
*
|
389
390
|
* @param remote the remote to disconnect from
|
391
|
+
* @return 0 on success, or an error code
|
390
392
|
*/
|
391
|
-
GIT_EXTERN(
|
393
|
+
GIT_EXTERN(int) git_remote_disconnect(git_remote *remote);
|
392
394
|
|
393
395
|
/**
|
394
396
|
* Free the memory associated with a remote
|
@@ -415,18 +417,19 @@ GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo);
|
|
415
417
|
* Argument to the completion callback which tells it which operation
|
416
418
|
* finished.
|
417
419
|
*/
|
418
|
-
typedef enum
|
420
|
+
typedef enum git_remote_completion_t {
|
419
421
|
GIT_REMOTE_COMPLETION_DOWNLOAD,
|
420
422
|
GIT_REMOTE_COMPLETION_INDEXING,
|
421
423
|
GIT_REMOTE_COMPLETION_ERROR,
|
422
|
-
}
|
424
|
+
} git_remote_completion_t;
|
423
425
|
|
424
426
|
/** Push network progress notification function */
|
425
|
-
typedef int GIT_CALLBACK(
|
427
|
+
typedef int GIT_CALLBACK(git_push_transfer_progress_cb)(
|
426
428
|
unsigned int current,
|
427
429
|
unsigned int total,
|
428
430
|
size_t bytes,
|
429
431
|
void* payload);
|
432
|
+
|
430
433
|
/**
|
431
434
|
* Represents an update which will be performed on the remote during push
|
432
435
|
*/
|
@@ -473,6 +476,20 @@ typedef int GIT_CALLBACK(git_push_negotiation)(const git_push_update **updates,
|
|
473
476
|
*/
|
474
477
|
typedef int GIT_CALLBACK(git_push_update_reference_cb)(const char *refname, const char *status, void *data);
|
475
478
|
|
479
|
+
/**
|
480
|
+
* Callback to resolve URLs before connecting to remote
|
481
|
+
*
|
482
|
+
* If you return GIT_PASSTHROUGH, you don't need to write anything to
|
483
|
+
* url_resolved.
|
484
|
+
*
|
485
|
+
* @param url_resolved The buffer to write the resolved URL to
|
486
|
+
* @param url The URL to resolve
|
487
|
+
* @param direction GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH
|
488
|
+
* @param payload Payload provided by the caller
|
489
|
+
* @return 0 on success, GIT_PASSTHROUGH or an error
|
490
|
+
*/
|
491
|
+
typedef int GIT_CALLBACK(git_url_resolve_cb)(git_buf *url_resolved, const char *url, int direction, void *payload);
|
492
|
+
|
476
493
|
/**
|
477
494
|
* The callback settings structure
|
478
495
|
*
|
@@ -480,7 +497,8 @@ typedef int GIT_CALLBACK(git_push_update_reference_cb)(const char *refname, cons
|
|
480
497
|
* about the progress of the network operations.
|
481
498
|
*/
|
482
499
|
struct git_remote_callbacks {
|
483
|
-
unsigned int version;
|
500
|
+
unsigned int version; /**< The version */
|
501
|
+
|
484
502
|
/**
|
485
503
|
* Textual progress from the remote. Text send over the
|
486
504
|
* progress side-band will be passed to this function (this is
|
@@ -492,7 +510,7 @@ struct git_remote_callbacks {
|
|
492
510
|
* Completion is called when different parts of the download
|
493
511
|
* process are done (currently unused).
|
494
512
|
*/
|
495
|
-
int GIT_CALLBACK(completion)(
|
513
|
+
int GIT_CALLBACK(completion)(git_remote_completion_t type, void *data);
|
496
514
|
|
497
515
|
/**
|
498
516
|
* This will be called if the remote host requires
|
@@ -501,7 +519,7 @@ struct git_remote_callbacks {
|
|
501
519
|
* Returning GIT_PASSTHROUGH will make libgit2 behave as
|
502
520
|
* though this field isn't set.
|
503
521
|
*/
|
504
|
-
|
522
|
+
git_credential_acquire_cb credentials;
|
505
523
|
|
506
524
|
/**
|
507
525
|
* If cert verification fails, this will be called to let the
|
@@ -516,7 +534,7 @@ struct git_remote_callbacks {
|
|
516
534
|
* called with the current count of progress done by the
|
517
535
|
* indexer.
|
518
536
|
*/
|
519
|
-
|
537
|
+
git_indexer_progress_cb transfer_progress;
|
520
538
|
|
521
539
|
/**
|
522
540
|
* Each time a reference is updated locally, this function
|
@@ -537,7 +555,7 @@ struct git_remote_callbacks {
|
|
537
555
|
* inline with pack building operations, so performance may be
|
538
556
|
* affected.
|
539
557
|
*/
|
540
|
-
|
558
|
+
git_push_transfer_progress_cb push_transfer_progress;
|
541
559
|
|
542
560
|
/**
|
543
561
|
* See documentation of git_push_update_reference_cb
|
@@ -561,6 +579,12 @@ struct git_remote_callbacks {
|
|
561
579
|
* as the last parameter.
|
562
580
|
*/
|
563
581
|
void *payload;
|
582
|
+
|
583
|
+
/**
|
584
|
+
* Resolve URL before connecting to remote.
|
585
|
+
* The returned URL will be used to connect to the remote instead.
|
586
|
+
*/
|
587
|
+
git_url_resolve_cb resolve_url;
|
564
588
|
};
|
565
589
|
|
566
590
|
#define GIT_REMOTE_CALLBACKS_VERSION 1
|
@@ -578,6 +602,7 @@ GIT_EXTERN(int) git_remote_init_callbacks(
|
|
578
602
|
git_remote_callbacks *opts,
|
579
603
|
unsigned int version);
|
580
604
|
|
605
|
+
/** Acceptable prune settings when fetching */
|
581
606
|
typedef enum {
|
582
607
|
/**
|
583
608
|
* Use the setting from the configuration
|
@@ -679,7 +704,7 @@ typedef struct {
|
|
679
704
|
* @param version The struct version; pass `GIT_FETCH_OPTIONS_VERSION`.
|
680
705
|
* @return Zero on success; -1 on failure.
|
681
706
|
*/
|
682
|
-
GIT_EXTERN(int)
|
707
|
+
GIT_EXTERN(int) git_fetch_options_init(
|
683
708
|
git_fetch_options *opts,
|
684
709
|
unsigned int version);
|
685
710
|
|
@@ -729,7 +754,7 @@ typedef struct {
|
|
729
754
|
* @param version The struct version; pass `GIT_PUSH_OPTIONS_VERSION`.
|
730
755
|
* @return Zero on success; -1 on failure.
|
731
756
|
*/
|
732
|
-
GIT_EXTERN(int)
|
757
|
+
GIT_EXTERN(int) git_push_options_init(
|
733
758
|
git_push_options *opts,
|
734
759
|
unsigned int version);
|
735
760
|
|
@@ -832,7 +857,7 @@ GIT_EXTERN(int) git_remote_push(git_remote *remote,
|
|
832
857
|
/**
|
833
858
|
* Get the statistics structure that is filled in by the fetch operation.
|
834
859
|
*/
|
835
|
-
GIT_EXTERN(const
|
860
|
+
GIT_EXTERN(const git_indexer_progress *) git_remote_stats(git_remote *remote);
|
836
861
|
|
837
862
|
/**
|
838
863
|
* Retrieve the tag auto-follow setting
|