rugged 1.3.1 → 1.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +34 -2
- data/ext/rugged/extconf.rb +6 -3
- data/ext/rugged/rugged.c +16 -0
- data/ext/rugged/rugged.h +4 -0
- data/ext/rugged/rugged_allocator.c +0 -54
- data/ext/rugged/rugged_blame.c +2 -0
- data/ext/rugged/rugged_blob.c +3 -0
- data/ext/rugged/rugged_commit.c +1 -0
- data/ext/rugged/rugged_config.c +9 -2
- data/ext/rugged/rugged_diff.c +1 -0
- data/ext/rugged/rugged_index.c +2 -0
- data/ext/rugged/rugged_patch.c +1 -0
- data/ext/rugged/rugged_rebase.c +1 -0
- data/ext/rugged/rugged_reference.c +1 -0
- data/ext/rugged/rugged_remote.c +28 -10
- data/ext/rugged/rugged_repo.c +7 -9
- data/ext/rugged/rugged_revwalk.c +5 -1
- data/ext/rugged/rugged_settings.c +5 -0
- data/ext/rugged/rugged_submodule.c +1 -0
- data/ext/rugged/rugged_tag.c +1 -0
- data/ext/rugged/rugged_tree.c +4 -0
- data/lib/rugged/index.rb +1 -1
- data/lib/rugged/tree.rb +5 -1
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/AUTHORS +1 -0
- data/vendor/libgit2/CMakeLists.txt +141 -289
- data/vendor/libgit2/COPYING +301 -20
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
- data/vendor/libgit2/cmake/CheckPrototypeDefinitionSafe.cmake +16 -0
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
- 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 +17 -17
- data/vendor/libgit2/cmake/FindIntlIconv.cmake +51 -0
- data/vendor/libgit2/cmake/FindLLHTTP.cmake +39 -0
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
- data/vendor/libgit2/cmake/FindPCRE.cmake +12 -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 +8 -8
- 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 +34 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +129 -101
- data/vendor/libgit2/cmake/SelectHashes.cmake +113 -54
- data/vendor/libgit2/cmake/SelectRegex.cmake +56 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +46 -0
- data/vendor/libgit2/cmake/SelectXdiff.cmake +9 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +38 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
- data/vendor/libgit2/deps/llhttp/CMakeLists.txt +8 -0
- data/vendor/libgit2/deps/llhttp/LICENSE-MIT +22 -0
- data/vendor/libgit2/deps/llhttp/api.c +510 -0
- data/vendor/libgit2/deps/llhttp/http.c +170 -0
- data/vendor/libgit2/deps/llhttp/llhttp.c +10168 -0
- data/vendor/libgit2/deps/llhttp/llhttp.h +897 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
- data/vendor/libgit2/deps/ntlmclient/crypt_builtin_md4.c +311 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +2 -1
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +0 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +7 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +25 -25
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +5 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +2 -1
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1176 -721
- data/vendor/libgit2/deps/ntlmclient/util.h +11 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +89 -88
- data/vendor/libgit2/deps/pcre/LICENCE +5 -5
- data/vendor/libgit2/deps/pcre/pcre.h +2 -2
- data/vendor/libgit2/deps/pcre/pcre_compile.c +6 -3
- data/vendor/libgit2/deps/pcre/pcre_exec.c +2 -2
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/deps/xdiff/CMakeLists.txt +28 -0
- data/vendor/libgit2/deps/xdiff/git-xdiff.h +56 -0
- data/vendor/libgit2/{src → deps}/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/{src → deps}/xdiff/xdiffi.c +152 -125
- data/vendor/libgit2/{src → deps}/xdiff/xdiffi.h +2 -4
- data/vendor/libgit2/{src → deps}/xdiff/xemit.c +26 -10
- data/vendor/libgit2/{src → deps}/xdiff/xhistogram.c +92 -94
- data/vendor/libgit2/{src → deps}/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/{src → deps}/xdiff/xmacros.h +18 -1
- data/vendor/libgit2/{src → deps}/xdiff/xmerge.c +126 -137
- data/vendor/libgit2/{src → deps}/xdiff/xpatience.c +26 -46
- data/vendor/libgit2/{src → deps}/xdiff/xprepare.c +24 -46
- data/vendor/libgit2/{src → deps}/xdiff/xutils.c +36 -8
- data/vendor/libgit2/{src → deps}/xdiff/xutils.h +2 -1
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -1
- data/vendor/libgit2/deps/zlib/LICENSE +22 -0
- data/vendor/libgit2/deps/zlib/adler32.c +7 -22
- data/vendor/libgit2/deps/zlib/crc32.c +931 -317
- data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
- data/vendor/libgit2/deps/zlib/deflate.c +428 -453
- data/vendor/libgit2/deps/zlib/deflate.h +51 -23
- data/vendor/libgit2/deps/zlib/gzguts.h +15 -19
- data/vendor/libgit2/deps/zlib/infback.c +19 -31
- data/vendor/libgit2/deps/zlib/inffast.c +15 -18
- data/vendor/libgit2/deps/zlib/inffast.h +1 -1
- data/vendor/libgit2/deps/zlib/inflate.c +75 -110
- data/vendor/libgit2/deps/zlib/inflate.h +3 -2
- data/vendor/libgit2/deps/zlib/inftrees.c +6 -11
- data/vendor/libgit2/deps/zlib/inftrees.h +6 -6
- data/vendor/libgit2/deps/zlib/trees.c +294 -380
- data/vendor/libgit2/deps/zlib/zconf.h +23 -14
- data/vendor/libgit2/deps/zlib/zlib.h +310 -284
- data/vendor/libgit2/deps/zlib/zutil.c +20 -46
- data/vendor/libgit2/deps/zlib/zutil.h +24 -41
- data/vendor/libgit2/include/git2/annotated_commit.h +12 -5
- data/vendor/libgit2/include/git2/apply.h +43 -8
- data/vendor/libgit2/include/git2/attr.h +28 -6
- data/vendor/libgit2/include/git2/blame.h +137 -29
- data/vendor/libgit2/include/git2/blob.h +85 -29
- data/vendor/libgit2/include/git2/branch.h +25 -16
- data/vendor/libgit2/include/git2/buffer.h +24 -82
- data/vendor/libgit2/include/git2/cert.h +4 -3
- data/vendor/libgit2/include/git2/checkout.h +88 -34
- data/vendor/libgit2/include/git2/cherrypick.h +10 -3
- data/vendor/libgit2/include/git2/clone.h +28 -12
- data/vendor/libgit2/include/git2/commit.h +134 -3
- data/vendor/libgit2/include/git2/common.h +172 -59
- data/vendor/libgit2/include/git2/config.h +118 -32
- data/vendor/libgit2/include/git2/credential.h +32 -3
- data/vendor/libgit2/include/git2/credential_helpers.h +2 -0
- data/vendor/libgit2/include/git2/deprecated.h +141 -3
- data/vendor/libgit2/include/git2/describe.h +20 -3
- data/vendor/libgit2/include/git2/diff.h +95 -19
- data/vendor/libgit2/include/git2/email.h +10 -30
- data/vendor/libgit2/include/git2/errors.h +51 -61
- data/vendor/libgit2/include/git2/experimental.h +20 -0
- data/vendor/libgit2/include/git2/filter.h +21 -9
- data/vendor/libgit2/include/git2/global.h +8 -1
- data/vendor/libgit2/include/git2/graph.h +4 -2
- data/vendor/libgit2/include/git2/ignore.h +11 -1
- data/vendor/libgit2/include/git2/index.h +111 -11
- data/vendor/libgit2/include/git2/indexer.h +67 -2
- data/vendor/libgit2/include/git2/mailmap.h +7 -1
- data/vendor/libgit2/include/git2/merge.h +70 -5
- data/vendor/libgit2/include/git2/message.h +4 -2
- data/vendor/libgit2/include/git2/net.h +3 -1
- data/vendor/libgit2/include/git2/notes.h +9 -6
- data/vendor/libgit2/include/git2/object.h +57 -7
- data/vendor/libgit2/include/git2/odb.h +156 -33
- data/vendor/libgit2/include/git2/odb_backend.h +132 -16
- data/vendor/libgit2/include/git2/oid.h +116 -17
- data/vendor/libgit2/include/git2/oidarray.h +7 -1
- data/vendor/libgit2/include/git2/pack.h +37 -9
- data/vendor/libgit2/include/git2/patch.h +10 -3
- data/vendor/libgit2/include/git2/pathspec.h +10 -1
- data/vendor/libgit2/include/git2/proxy.h +11 -1
- data/vendor/libgit2/include/git2/rebase.h +18 -7
- data/vendor/libgit2/include/git2/refdb.h +5 -2
- data/vendor/libgit2/include/git2/reflog.h +4 -3
- data/vendor/libgit2/include/git2/refs.h +11 -8
- data/vendor/libgit2/include/git2/refspec.h +14 -4
- data/vendor/libgit2/include/git2/remote.h +295 -54
- data/vendor/libgit2/include/git2/repository.h +95 -25
- data/vendor/libgit2/include/git2/reset.h +18 -5
- data/vendor/libgit2/include/git2/revert.h +9 -4
- data/vendor/libgit2/include/git2/revparse.h +4 -4
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/signature.h +47 -2
- data/vendor/libgit2/include/git2/stash.h +78 -10
- data/vendor/libgit2/include/git2/status.h +24 -11
- data/vendor/libgit2/include/git2/stdint.h +87 -85
- data/vendor/libgit2/include/git2/strarray.h +2 -16
- data/vendor/libgit2/include/git2/submodule.h +27 -11
- data/vendor/libgit2/include/git2/sys/alloc.h +12 -34
- data/vendor/libgit2/include/git2/sys/commit.h +77 -3
- data/vendor/libgit2/include/git2/sys/commit_graph.h +110 -59
- data/vendor/libgit2/include/git2/sys/config.h +80 -4
- data/vendor/libgit2/include/git2/sys/credential.h +4 -3
- data/vendor/libgit2/include/git2/sys/diff.h +21 -1
- data/vendor/libgit2/include/git2/sys/email.h +7 -0
- data/vendor/libgit2/include/git2/sys/errors.h +76 -0
- data/vendor/libgit2/include/git2/sys/filter.h +66 -3
- data/vendor/libgit2/include/git2/sys/hashsig.h +11 -0
- data/vendor/libgit2/include/git2/sys/index.h +3 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +32 -2
- data/vendor/libgit2/include/git2/sys/merge.h +55 -7
- data/vendor/libgit2/include/git2/sys/midx.h +47 -4
- data/vendor/libgit2/include/git2/sys/odb_backend.h +10 -9
- data/vendor/libgit2/include/git2/sys/openssl.h +8 -1
- data/vendor/libgit2/include/git2/sys/path.h +12 -1
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +40 -36
- data/vendor/libgit2/include/git2/sys/refs.h +3 -2
- data/vendor/libgit2/include/git2/sys/remote.h +53 -0
- data/vendor/libgit2/include/git2/sys/repository.h +63 -3
- data/vendor/libgit2/include/git2/sys/stream.h +26 -3
- data/vendor/libgit2/include/git2/sys/transport.h +87 -41
- data/vendor/libgit2/include/git2/tag.h +4 -1
- data/vendor/libgit2/include/git2/trace.h +9 -3
- data/vendor/libgit2/include/git2/transaction.h +3 -2
- data/vendor/libgit2/include/git2/transport.h +11 -3
- data/vendor/libgit2/include/git2/tree.h +20 -8
- data/vendor/libgit2/include/git2/types.h +26 -10
- data/vendor/libgit2/include/git2/version.h +63 -6
- data/vendor/libgit2/include/git2/worktree.h +30 -8
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +203 -420
- data/vendor/libgit2/src/README.md +12 -0
- data/vendor/libgit2/src/cli/CMakeLists.txt +56 -0
- data/vendor/libgit2/src/cli/README.md +26 -0
- data/vendor/libgit2/src/{branch.h → cli/cmd.c} +10 -8
- data/vendor/libgit2/src/cli/cmd.h +37 -0
- data/vendor/libgit2/src/cli/cmd_blame.c +287 -0
- data/vendor/libgit2/src/cli/cmd_cat_file.c +202 -0
- data/vendor/libgit2/src/cli/cmd_clone.c +190 -0
- data/vendor/libgit2/src/cli/cmd_config.c +241 -0
- data/vendor/libgit2/src/cli/cmd_hash_object.c +152 -0
- data/vendor/libgit2/src/cli/cmd_help.c +85 -0
- data/vendor/libgit2/src/cli/cmd_index_pack.c +114 -0
- data/vendor/libgit2/src/cli/cmd_init.c +102 -0
- data/vendor/libgit2/src/cli/common.c +168 -0
- data/vendor/libgit2/src/cli/common.h +63 -0
- data/vendor/libgit2/src/cli/error.h +51 -0
- data/vendor/libgit2/src/cli/main.c +134 -0
- data/vendor/libgit2/src/cli/opt.c +695 -0
- data/vendor/libgit2/src/cli/opt.h +367 -0
- data/vendor/libgit2/src/cli/opt_usage.c +263 -0
- data/vendor/libgit2/src/cli/opt_usage.h +40 -0
- data/vendor/libgit2/src/cli/progress.c +395 -0
- data/vendor/libgit2/src/cli/progress.h +129 -0
- data/vendor/libgit2/src/cli/sighandler.h +20 -0
- data/vendor/libgit2/src/cli/unix/sighandler.c +37 -0
- data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
- data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
- data/vendor/libgit2/src/libgit2/CMakeLists.txt +140 -0
- data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +2 -2
- data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
- data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +32 -34
- data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
- data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +48 -31
- data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +25 -20
- data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +6 -4
- data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +87 -46
- data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +5 -9
- data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +152 -57
- data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +1 -0
- data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -2
- data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
- data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
- data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
- data/vendor/libgit2/src/libgit2/branch.h +31 -0
- data/vendor/libgit2/src/libgit2/buf.c +126 -0
- data/vendor/libgit2/src/libgit2/buf.h +50 -0
- data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +22 -17
- data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +7 -9
- data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +107 -91
- data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -2
- data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +14 -15
- data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +254 -203
- data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +4 -1
- data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +296 -77
- data/vendor/libgit2/src/libgit2/commit.h +87 -0
- data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +246 -135
- data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +33 -8
- data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +17 -7
- data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +1 -0
- data/vendor/libgit2/src/libgit2/common.h +55 -0
- data/vendor/libgit2/src/{config.c → libgit2/config.c} +490 -360
- data/vendor/libgit2/src/libgit2/config.cmake.in +3 -0
- data/vendor/libgit2/src/{config.h → libgit2/config.h} +24 -6
- data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +8 -10
- data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +4 -5
- data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +212 -183
- data/vendor/libgit2/src/libgit2/config_list.c +285 -0
- data/vendor/libgit2/src/libgit2/config_list.h +32 -0
- data/vendor/libgit2/src/libgit2/config_mem.c +374 -0
- data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +37 -32
- data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +24 -31
- data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
- data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +62 -51
- data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +44 -14
- data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +8 -10
- data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +46 -55
- data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +5 -5
- data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +45 -27
- data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +70 -20
- data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
- data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +22 -6
- data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +192 -105
- data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
- data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
- data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +49 -16
- data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
- data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +1 -1
- data/vendor/libgit2/src/{email.c → libgit2/email.c} +58 -40
- data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
- data/vendor/libgit2/src/{transports/ssh.h → libgit2/experimental.h.in} +3 -4
- data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +105 -30
- data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -3
- data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +30 -28
- data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +132 -58
- data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
- data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +3 -3
- data/vendor/libgit2/src/libgit2/grafts.c +270 -0
- data/vendor/libgit2/src/libgit2/grafts.h +35 -0
- data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +1 -1
- data/vendor/libgit2/src/libgit2/hashmap_oid.h +30 -0
- data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
- data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +44 -39
- data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
- data/vendor/libgit2/src/{index.c → libgit2/index.c} +460 -276
- data/vendor/libgit2/src/{index.h → libgit2/index.h} +21 -5
- data/vendor/libgit2/src/libgit2/index_map.c +95 -0
- data/vendor/libgit2/src/libgit2/index_map.h +28 -0
- data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +208 -124
- data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +102 -71
- data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +8 -5
- data/vendor/libgit2/src/libgit2/libgit2.c +268 -0
- data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +39 -37
- data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +83 -73
- data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
- data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +4 -4
- data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -5
- data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
- data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +174 -112
- data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +17 -6
- data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +53 -57
- data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +9 -2
- data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +29 -37
- data/vendor/libgit2/src/{object.c → libgit2/object.c} +166 -35
- data/vendor/libgit2/src/{object.h → libgit2/object.h} +17 -2
- data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +261 -88
- data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
- data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
- data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +67 -22
- data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +162 -89
- data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +171 -92
- data/vendor/libgit2/src/libgit2/oid.h +284 -0
- data/vendor/libgit2/src/libgit2/oidarray.c +89 -0
- data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +5 -1
- data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +126 -66
- data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +28 -12
- data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +146 -111
- data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +45 -25
- data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +8 -4
- data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +1 -1
- data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
- data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +8 -1
- data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +51 -16
- data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
- data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +42 -34
- data/vendor/libgit2/src/libgit2/path.c +375 -0
- data/vendor/libgit2/src/libgit2/path.h +68 -0
- data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +7 -7
- data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
- data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
- data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
- data/vendor/libgit2/src/{push.c → libgit2/push.c} +116 -60
- data/vendor/libgit2/src/{push.h → libgit2/push.h} +5 -16
- data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
- data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
- data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +147 -147
- data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +639 -254
- data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +8 -7
- data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +3 -2
- data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +67 -39
- data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +8 -3
- data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +60 -38
- data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +13 -2
- data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +821 -454
- data/vendor/libgit2/src/libgit2/remote.h +101 -0
- data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +1377 -594
- data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +43 -12
- data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
- data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +18 -22
- data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +76 -44
- data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +48 -19
- data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +3 -3
- data/vendor/libgit2/src/{libgit2.c → libgit2/settings.c} +162 -95
- data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +6 -2
- data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +144 -21
- data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -2
- data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +243 -68
- data/vendor/libgit2/src/{status.c → libgit2/status.c} +5 -2
- data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
- data/vendor/libgit2/src/libgit2/strarray.h +25 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +62 -67
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +41 -24
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +2 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +11 -3
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +6 -3
- data/vendor/libgit2/src/libgit2/streams/schannel.c +715 -0
- data/vendor/libgit2/src/libgit2/streams/schannel.h +28 -0
- data/vendor/libgit2/src/libgit2/streams/socket.c +428 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +3 -1
- data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +79 -19
- data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +5 -0
- data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +279 -220
- data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +10 -11
- data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
- data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +55 -18
- data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +74 -43
- data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
- data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
- data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
- data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +7 -7
- data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +27 -21
- data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +4 -1
- data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +14 -11
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +3 -5
- data/vendor/libgit2/src/{transports/auth_negotiate.c → libgit2/transports/auth_gssapi.c} +44 -45
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +1 -1
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +1 -2
- data/vendor/libgit2/src/{transports/auth_ntlm.c → libgit2/transports/auth_ntlmclient.c} +22 -22
- data/vendor/libgit2/src/libgit2/transports/auth_sspi.c +341 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +1 -1
- data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +16 -19
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +49 -24
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +0 -11
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +188 -134
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
- data/vendor/libgit2/src/libgit2/transports/httpparser.c +128 -0
- data/vendor/libgit2/src/libgit2/transports/httpparser.h +99 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +159 -127
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +142 -165
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +56 -36
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +307 -74
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +297 -97
- data/vendor/libgit2/src/libgit2/transports/ssh.c +85 -0
- data/vendor/libgit2/src/libgit2/transports/ssh_exec.c +347 -0
- data/vendor/libgit2/src/libgit2/transports/ssh_exec.h +26 -0
- data/vendor/libgit2/src/{transports/ssh.c → libgit2/transports/ssh_libssh2.c} +414 -268
- data/vendor/libgit2/src/libgit2/transports/ssh_libssh2.h +28 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +101 -75
- data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +30 -20
- data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +7 -5
- data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +128 -110
- data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +7 -6
- data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +160 -121
- data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
- data/vendor/libgit2/src/util/CMakeLists.txt +77 -0
- data/vendor/libgit2/src/{alloc.c → util/alloc.c} +69 -7
- data/vendor/libgit2/src/util/alloc.h +65 -0
- data/vendor/libgit2/src/util/allocators/debugalloc.c +73 -0
- data/vendor/libgit2/src/util/allocators/debugalloc.h +17 -0
- data/vendor/libgit2/src/util/allocators/failalloc.c +32 -0
- data/vendor/libgit2/src/util/allocators/failalloc.h +17 -0
- data/vendor/libgit2/src/util/allocators/stdalloc.c +37 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
- data/vendor/libgit2/src/util/allocators/win32_leakcheck.c +50 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{array.h → util/array.h} +25 -19
- data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
- data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +5 -1
- data/vendor/libgit2/src/util/ctype_compat.h +70 -0
- data/vendor/libgit2/src/{date.c → util/date.c} +35 -33
- data/vendor/libgit2/src/util/date.h +45 -0
- data/vendor/libgit2/src/util/errors.c +401 -0
- data/vendor/libgit2/src/{errors.h → util/errors.h} +22 -19
- data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +35 -30
- data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +21 -8
- data/vendor/libgit2/src/{path.c → util/fs_path.c} +591 -615
- data/vendor/libgit2/src/{path.h → util/fs_path.h} +257 -181
- data/vendor/libgit2/src/{futils.c → util/futils.c} +144 -95
- data/vendor/libgit2/src/{futils.h → util/futils.h} +40 -18
- data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +33 -2
- data/vendor/libgit2/src/{common.h → util/git2_util.h} +26 -59
- data/vendor/libgit2/src/util/hash/builtin.c +53 -0
- data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
- data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
- data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
- data/vendor/libgit2/src/util/hash/openssl.c +347 -0
- data/vendor/libgit2/src/util/hash/openssl.h +61 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
- data/vendor/libgit2/src/util/hash/sha.h +73 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
- data/vendor/libgit2/src/util/hash/win32.c +549 -0
- data/vendor/libgit2/src/util/hash/win32.h +60 -0
- data/vendor/libgit2/src/util/hash.c +158 -0
- data/vendor/libgit2/src/util/hash.h +61 -0
- data/vendor/libgit2/src/util/hashmap.h +424 -0
- data/vendor/libgit2/src/util/hashmap_str.h +43 -0
- data/vendor/libgit2/src/{integer.h → util/integer.h} +3 -1
- data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
- data/vendor/libgit2/src/util/net.c +1160 -0
- data/vendor/libgit2/src/{net.h → util/net.h} +45 -4
- data/vendor/libgit2/src/{pool.c → util/pool.c} +1 -1
- data/vendor/libgit2/src/{pool.h → util/pool.h} +6 -1
- data/vendor/libgit2/src/{posix.c → util/posix.c} +57 -3
- data/vendor/libgit2/src/{posix.h → util/posix.h} +26 -1
- data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +3 -3
- data/vendor/libgit2/src/util/process.h +222 -0
- data/vendor/libgit2/src/util/rand.c +230 -0
- data/vendor/libgit2/src/util/rand.h +37 -0
- data/vendor/libgit2/src/{regexp.c → util/regexp.c} +5 -5
- data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
- data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
- data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
- data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +15 -14
- data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +5 -5
- data/vendor/libgit2/src/util/staticstr.h +66 -0
- data/vendor/libgit2/src/{buffer.c → util/str.c} +159 -153
- data/vendor/libgit2/src/util/str.h +357 -0
- data/vendor/libgit2/src/util/strlist.c +108 -0
- data/vendor/libgit2/src/util/strlist.h +36 -0
- data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
- data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
- data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
- data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -6
- data/vendor/libgit2/src/util/unix/process.c +629 -0
- data/vendor/libgit2/src/{unix → util/unix}/realpath.c +24 -8
- data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
- data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
- data/vendor/libgit2/src/{util.c → util/util.c} +24 -19
- data/vendor/libgit2/src/{util.h → util/util.h} +30 -81
- data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
- data/vendor/libgit2/src/{vector.c → util/vector.c} +3 -3
- data/vendor/libgit2/src/{vector.h → util/vector.h} +4 -4
- data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/error.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +148 -17
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
- data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
- data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +42 -35
- data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
- data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
- data/vendor/libgit2/src/util/win32/process.c +506 -0
- data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
- data/vendor/libgit2/src/util/win32/utf-conv.c +144 -0
- data/vendor/libgit2/src/util/win32/utf-conv.h +127 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
- data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
- data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
- metadata +431 -362
- data/vendor/libgit2/cmake/FindIconv.cmake +0 -45
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +0 -6
- data/vendor/libgit2/deps/http-parser/COPYING +0 -23
- data/vendor/libgit2/deps/http-parser/http_parser.c +0 -2182
- data/vendor/libgit2/deps/http-parser/http_parser.h +0 -305
- data/vendor/libgit2/deps/zlib/COPYING +0 -27
- data/vendor/libgit2/include/git2/sys/reflog.h +0 -21
- data/vendor/libgit2/src/alloc.h +0 -40
- data/vendor/libgit2/src/allocators/failalloc.c +0 -92
- data/vendor/libgit2/src/allocators/failalloc.h +0 -23
- data/vendor/libgit2/src/allocators/stdalloc.c +0 -150
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +0 -118
- data/vendor/libgit2/src/buffer.h +0 -374
- data/vendor/libgit2/src/commit.h +0 -46
- data/vendor/libgit2/src/config_entries.c +0 -237
- data/vendor/libgit2/src/config_entries.h +0 -24
- data/vendor/libgit2/src/config_mem.c +0 -220
- data/vendor/libgit2/src/errors.c +0 -238
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
- data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
- data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
- data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
- data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
- data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
- data/vendor/libgit2/src/hash/sha1.h +0 -38
- data/vendor/libgit2/src/hash.c +0 -110
- data/vendor/libgit2/src/hash.h +0 -46
- data/vendor/libgit2/src/idxmap.c +0 -157
- data/vendor/libgit2/src/idxmap.h +0 -177
- data/vendor/libgit2/src/khash.h +0 -615
- data/vendor/libgit2/src/libgit2.h +0 -15
- data/vendor/libgit2/src/message.h +0 -17
- data/vendor/libgit2/src/net.c +0 -540
- data/vendor/libgit2/src/netops.c +0 -125
- data/vendor/libgit2/src/netops.h +0 -68
- data/vendor/libgit2/src/offmap.c +0 -101
- data/vendor/libgit2/src/offmap.h +0 -133
- data/vendor/libgit2/src/oid.h +0 -51
- data/vendor/libgit2/src/oidarray.c +0 -43
- data/vendor/libgit2/src/oidmap.c +0 -107
- data/vendor/libgit2/src/oidmap.h +0 -128
- data/vendor/libgit2/src/remote.h +0 -55
- data/vendor/libgit2/src/streams/socket.c +0 -239
- data/vendor/libgit2/src/strmap.c +0 -100
- data/vendor/libgit2/src/strmap.h +0 -131
- data/vendor/libgit2/src/sysdir.c +0 -347
- data/vendor/libgit2/src/threadstate.c +0 -84
- data/vendor/libgit2/src/threadstate.h +0 -24
- data/vendor/libgit2/src/win32/findfile.c +0 -230
- data/vendor/libgit2/src/win32/findfile.h +0 -19
- data/vendor/libgit2/src/win32/utf-conv.c +0 -146
- data/vendor/libgit2/src/win32/utf-conv.h +0 -60
- /data/vendor/libgit2/{src → deps}/xdiff/xemit.h +0 -0
- /data/vendor/libgit2/{src → deps}/xdiff/xprepare.h +0 -0
- /data/vendor/libgit2/{src → deps}/xdiff/xtypes.h +0 -0
- /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
- /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
- /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
- /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
- /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
- /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
- /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
- /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
- /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
- /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
- /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
- /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
- /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
- /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
- /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
- /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
- /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
- /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
- /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
- /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
- /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
- /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
- /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
- /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
- /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
- /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
- /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
- /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
- /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -24,13 +24,11 @@ z_const char * const z_errmsg[10] = {
|
|
24
24
|
};
|
25
25
|
|
26
26
|
|
27
|
-
const char * ZEXPORT zlibVersion()
|
28
|
-
{
|
27
|
+
const char * ZEXPORT zlibVersion(void) {
|
29
28
|
return ZLIB_VERSION;
|
30
29
|
}
|
31
30
|
|
32
|
-
uLong ZEXPORT zlibCompileFlags()
|
33
|
-
{
|
31
|
+
uLong ZEXPORT zlibCompileFlags(void) {
|
34
32
|
uLong flags;
|
35
33
|
|
36
34
|
flags = 0;
|
@@ -61,9 +59,11 @@ uLong ZEXPORT zlibCompileFlags()
|
|
61
59
|
#ifdef ZLIB_DEBUG
|
62
60
|
flags += 1 << 8;
|
63
61
|
#endif
|
62
|
+
/*
|
64
63
|
#if defined(ASMV) || defined(ASMINF)
|
65
64
|
flags += 1 << 9;
|
66
65
|
#endif
|
66
|
+
*/
|
67
67
|
#ifdef ZLIB_WINAPI
|
68
68
|
flags += 1 << 10;
|
69
69
|
#endif
|
@@ -119,9 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
|
|
119
119
|
# endif
|
120
120
|
int ZLIB_INTERNAL z_verbose = verbose;
|
121
121
|
|
122
|
-
void ZLIB_INTERNAL z_error
|
123
|
-
char *m;
|
124
|
-
{
|
122
|
+
void ZLIB_INTERNAL z_error(char *m) {
|
125
123
|
fprintf(stderr, "%s\n", m);
|
126
124
|
exit(1);
|
127
125
|
}
|
@@ -130,14 +128,12 @@ void ZLIB_INTERNAL z_error (m)
|
|
130
128
|
/* exported to allow conversion of error code to string for compress() and
|
131
129
|
* uncompress()
|
132
130
|
*/
|
133
|
-
const char * ZEXPORT zError(err)
|
134
|
-
int err;
|
135
|
-
{
|
131
|
+
const char * ZEXPORT zError(int err) {
|
136
132
|
return ERR_MSG(err);
|
137
133
|
}
|
138
134
|
|
139
|
-
#if defined(_WIN32_WCE)
|
140
|
-
/* The Microsoft C Run-Time Library for Windows CE doesn't have
|
135
|
+
#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
|
136
|
+
/* The older Microsoft C Run-Time Library for Windows CE doesn't have
|
141
137
|
* errno. We define it as a global variable to simplify porting.
|
142
138
|
* Its value is always 0 and should not be used.
|
143
139
|
*/
|
@@ -146,22 +142,14 @@ const char * ZEXPORT zError(err)
|
|
146
142
|
|
147
143
|
#ifndef HAVE_MEMCPY
|
148
144
|
|
149
|
-
void ZLIB_INTERNAL zmemcpy(dest, source, len)
|
150
|
-
Bytef* dest;
|
151
|
-
const Bytef* source;
|
152
|
-
uInt len;
|
153
|
-
{
|
145
|
+
void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len) {
|
154
146
|
if (len == 0) return;
|
155
147
|
do {
|
156
148
|
*dest++ = *source++; /* ??? to be unrolled */
|
157
149
|
} while (--len != 0);
|
158
150
|
}
|
159
151
|
|
160
|
-
int ZLIB_INTERNAL zmemcmp(s1, s2, len)
|
161
|
-
const Bytef* s1;
|
162
|
-
const Bytef* s2;
|
163
|
-
uInt len;
|
164
|
-
{
|
152
|
+
int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len) {
|
165
153
|
uInt j;
|
166
154
|
|
167
155
|
for (j = 0; j < len; j++) {
|
@@ -170,10 +158,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
|
|
170
158
|
return 0;
|
171
159
|
}
|
172
160
|
|
173
|
-
void ZLIB_INTERNAL zmemzero(dest, len)
|
174
|
-
Bytef* dest;
|
175
|
-
uInt len;
|
176
|
-
{
|
161
|
+
void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len) {
|
177
162
|
if (len == 0) return;
|
178
163
|
do {
|
179
164
|
*dest++ = 0; /* ??? to be unrolled */
|
@@ -214,8 +199,7 @@ local ptr_table table[MAX_PTR];
|
|
214
199
|
* a protected system like OS/2. Use Microsoft C instead.
|
215
200
|
*/
|
216
201
|
|
217
|
-
voidpf ZLIB_INTERNAL zcalloc
|
218
|
-
{
|
202
|
+
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
|
219
203
|
voidpf buf;
|
220
204
|
ulg bsize = (ulg)items*size;
|
221
205
|
|
@@ -240,8 +224,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
|
|
240
224
|
return buf;
|
241
225
|
}
|
242
226
|
|
243
|
-
void ZLIB_INTERNAL zcfree
|
244
|
-
{
|
227
|
+
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
|
245
228
|
int n;
|
246
229
|
|
247
230
|
(void)opaque;
|
@@ -277,14 +260,12 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
|
277
260
|
# define _hfree hfree
|
278
261
|
#endif
|
279
262
|
|
280
|
-
voidpf ZLIB_INTERNAL zcalloc
|
281
|
-
{
|
263
|
+
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
|
282
264
|
(void)opaque;
|
283
265
|
return _halloc((long)items, size);
|
284
266
|
}
|
285
267
|
|
286
|
-
void ZLIB_INTERNAL zcfree
|
287
|
-
{
|
268
|
+
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
|
288
269
|
(void)opaque;
|
289
270
|
_hfree(ptr);
|
290
271
|
}
|
@@ -297,25 +278,18 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
|
297
278
|
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
|
298
279
|
|
299
280
|
#ifndef STDC
|
300
|
-
extern voidp
|
301
|
-
extern voidp
|
302
|
-
extern void
|
281
|
+
extern voidp malloc(uInt size);
|
282
|
+
extern voidp calloc(uInt items, uInt size);
|
283
|
+
extern void free(voidpf ptr);
|
303
284
|
#endif
|
304
285
|
|
305
|
-
voidpf ZLIB_INTERNAL zcalloc
|
306
|
-
voidpf opaque;
|
307
|
-
unsigned items;
|
308
|
-
unsigned size;
|
309
|
-
{
|
286
|
+
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
|
310
287
|
(void)opaque;
|
311
288
|
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
|
312
289
|
(voidpf)calloc(items, size);
|
313
290
|
}
|
314
291
|
|
315
|
-
void ZLIB_INTERNAL zcfree
|
316
|
-
voidpf opaque;
|
317
|
-
voidpf ptr;
|
318
|
-
{
|
292
|
+
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
|
319
293
|
(void)opaque;
|
320
294
|
free(ptr);
|
321
295
|
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* zutil.h -- internal interface and configuration of the compression library
|
2
|
-
* Copyright (C) 1995-
|
2
|
+
* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
|
3
3
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
4
4
|
*/
|
5
5
|
|
@@ -29,10 +29,6 @@
|
|
29
29
|
# include <stdlib.h>
|
30
30
|
#endif
|
31
31
|
|
32
|
-
#ifdef Z_SOLO
|
33
|
-
typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
|
34
|
-
#endif
|
35
|
-
|
36
32
|
#ifndef local
|
37
33
|
# define local static
|
38
34
|
#endif
|
@@ -46,10 +42,21 @@ typedef unsigned short ush;
|
|
46
42
|
typedef ush FAR ushf;
|
47
43
|
typedef unsigned long ulg;
|
48
44
|
|
45
|
+
#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
|
46
|
+
# include <limits.h>
|
47
|
+
# if (ULONG_MAX == 0xffffffffffffffff)
|
48
|
+
# define Z_U8 unsigned long
|
49
|
+
# elif (ULLONG_MAX == 0xffffffffffffffff)
|
50
|
+
# define Z_U8 unsigned long long
|
51
|
+
# elif (UINT_MAX == 0xffffffffffffffff)
|
52
|
+
# define Z_U8 unsigned
|
53
|
+
# endif
|
54
|
+
#endif
|
55
|
+
|
49
56
|
extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
50
57
|
/* (size given to avoid silly warnings with Visual C++) */
|
51
58
|
|
52
|
-
#define ERR_MSG(err) z_errmsg[
|
59
|
+
#define ERR_MSG(err) z_errmsg[(err) < -6 || (err) > 2 ? 9 : 2 - (err)]
|
53
60
|
|
54
61
|
#define ERR_RETURN(strm,err) \
|
55
62
|
return (strm->msg = ERR_MSG(err), (err))
|
@@ -130,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
130
137
|
# endif
|
131
138
|
#endif
|
132
139
|
|
133
|
-
#if defined(MACOS)
|
140
|
+
#if defined(MACOS)
|
134
141
|
# define OS_CODE 7
|
135
|
-
# ifndef Z_SOLO
|
136
|
-
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
|
137
|
-
# include <unix.h> /* for fdopen */
|
138
|
-
# else
|
139
|
-
# ifndef fdopen
|
140
|
-
# define fdopen(fd,mode) NULL /* No fdopen() */
|
141
|
-
# endif
|
142
|
-
# endif
|
143
|
-
# endif
|
144
142
|
#endif
|
145
143
|
|
146
144
|
#ifdef __acorn
|
@@ -163,22 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
163
161
|
# define OS_CODE 19
|
164
162
|
#endif
|
165
163
|
|
166
|
-
#if defined(_BEOS_) || defined(RISCOS)
|
167
|
-
# define fdopen(fd,mode) NULL /* No fdopen() */
|
168
|
-
#endif
|
169
|
-
|
170
|
-
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
|
171
|
-
# if defined(_WIN32_WCE)
|
172
|
-
# define fdopen(fd,mode) NULL /* No fdopen() */
|
173
|
-
# ifndef _PTRDIFF_T_DEFINED
|
174
|
-
typedef int ptrdiff_t;
|
175
|
-
# define _PTRDIFF_T_DEFINED
|
176
|
-
# endif
|
177
|
-
# else
|
178
|
-
# define fdopen(fd,type) _fdopen(fd,type)
|
179
|
-
# endif
|
180
|
-
#endif
|
181
|
-
|
182
164
|
#if defined(__BORLANDC__) && !defined(MSDOS)
|
183
165
|
#pragma warn -8004
|
184
166
|
#pragma warn -8008
|
@@ -188,8 +170,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
188
170
|
/* provide prototypes for these when building zlib without LFS */
|
189
171
|
#if !defined(_WIN32) && \
|
190
172
|
(!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
|
191
|
-
ZEXTERN uLong ZEXPORT adler32_combine64
|
192
|
-
ZEXTERN uLong ZEXPORT crc32_combine64
|
173
|
+
ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
|
174
|
+
ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
|
175
|
+
ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
|
193
176
|
#endif
|
194
177
|
|
195
178
|
/* common defaults */
|
@@ -228,16 +211,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
228
211
|
# define zmemzero(dest, len) memset(dest, 0, len)
|
229
212
|
# endif
|
230
213
|
#else
|
231
|
-
void ZLIB_INTERNAL zmemcpy
|
232
|
-
int ZLIB_INTERNAL zmemcmp
|
233
|
-
void ZLIB_INTERNAL zmemzero
|
214
|
+
void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len);
|
215
|
+
int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
|
216
|
+
void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len);
|
234
217
|
#endif
|
235
218
|
|
236
219
|
/* Diagnostic functions */
|
237
220
|
#ifdef ZLIB_DEBUG
|
238
221
|
# include <stdio.h>
|
239
222
|
extern int ZLIB_INTERNAL z_verbose;
|
240
|
-
extern void ZLIB_INTERNAL z_error
|
223
|
+
extern void ZLIB_INTERNAL z_error(char *m);
|
241
224
|
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
242
225
|
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
243
226
|
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
@@ -254,9 +237,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
254
237
|
#endif
|
255
238
|
|
256
239
|
#ifndef Z_SOLO
|
257
|
-
voidpf ZLIB_INTERNAL zcalloc
|
258
|
-
|
259
|
-
void ZLIB_INTERNAL zcfree
|
240
|
+
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items,
|
241
|
+
unsigned size);
|
242
|
+
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr);
|
260
243
|
#endif
|
261
244
|
|
262
245
|
#define ZALLOC(strm, items, size) \
|
@@ -13,9 +13,16 @@
|
|
13
13
|
|
14
14
|
/**
|
15
15
|
* @file git2/annotated_commit.h
|
16
|
-
* @brief
|
16
|
+
* @brief A commit and information about how it was looked up by the user.
|
17
17
|
* @defgroup git_annotated_commit Git annotated commit routines
|
18
18
|
* @ingroup Git
|
19
|
+
*
|
20
|
+
* An "annotated commit" is a commit that contains information about
|
21
|
+
* how the commit was resolved, which can be used for maintaining the
|
22
|
+
* user's "intent" through commands like merge and rebase. For example,
|
23
|
+
* if a user wants to "merge HEAD" then an annotated commit is used to
|
24
|
+
* both contain the HEAD commit _and_ the fact that it was resolved as
|
25
|
+
* the HEAD ref.
|
19
26
|
* @{
|
20
27
|
*/
|
21
28
|
GIT_BEGIN_DECL
|
@@ -25,7 +32,7 @@ GIT_BEGIN_DECL
|
|
25
32
|
* The resulting git_annotated_commit must be freed with
|
26
33
|
* `git_annotated_commit_free`.
|
27
34
|
*
|
28
|
-
* @param out pointer to store the git_annotated_commit result in
|
35
|
+
* @param[out] out pointer to store the git_annotated_commit result in
|
29
36
|
* @param repo repository that contains the given reference
|
30
37
|
* @param ref reference to use to lookup the git_annotated_commit
|
31
38
|
* @return 0 on success or error code
|
@@ -40,7 +47,7 @@ GIT_EXTERN(int) git_annotated_commit_from_ref(
|
|
40
47
|
* The resulting git_annotated_commit must be freed with
|
41
48
|
* `git_annotated_commit_free`.
|
42
49
|
*
|
43
|
-
* @param out pointer to store the git_annotated_commit result in
|
50
|
+
* @param[out] out pointer to store the git_annotated_commit result in
|
44
51
|
* @param repo repository that contains the given commit
|
45
52
|
* @param branch_name name of the (remote) branch
|
46
53
|
* @param remote_url url of the remote
|
@@ -67,7 +74,7 @@ GIT_EXTERN(int) git_annotated_commit_from_fetchhead(
|
|
67
74
|
* most specific function (eg `git_annotated_commit_from_ref`)
|
68
75
|
* instead of this one when that data is known.
|
69
76
|
*
|
70
|
-
* @param out pointer to store the git_annotated_commit result in
|
77
|
+
* @param[out] out pointer to store the git_annotated_commit result in
|
71
78
|
* @param repo repository that contains the given commit
|
72
79
|
* @param id the commit object id to lookup
|
73
80
|
* @return 0 on success or error code
|
@@ -84,7 +91,7 @@ GIT_EXTERN(int) git_annotated_commit_lookup(
|
|
84
91
|
* http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for
|
85
92
|
* information on the syntax accepted.
|
86
93
|
*
|
87
|
-
* @param out pointer to store the git_annotated_commit result in
|
94
|
+
* @param[out] out pointer to store the git_annotated_commit result in
|
88
95
|
* @param repo repository that contains the given commit
|
89
96
|
* @param revspec the extended sha syntax string to use to lookup the commit
|
90
97
|
* @return 0 on success or error code
|
@@ -14,9 +14,12 @@
|
|
14
14
|
|
15
15
|
/**
|
16
16
|
* @file git2/apply.h
|
17
|
-
* @brief
|
17
|
+
* @brief Apply patches to the working directory or index
|
18
18
|
* @defgroup git_apply Git patch application routines
|
19
19
|
* @ingroup Git
|
20
|
+
*
|
21
|
+
* Mechanisms to apply a patch to the index, the working directory,
|
22
|
+
* or both.
|
20
23
|
* @{
|
21
24
|
*/
|
22
25
|
GIT_BEGIN_DECL
|
@@ -32,6 +35,8 @@ GIT_BEGIN_DECL
|
|
32
35
|
*
|
33
36
|
* @param delta The delta to be applied
|
34
37
|
* @param payload User-specified payload
|
38
|
+
* @return 0 if the delta is applied, < 0 if the apply process will be aborted
|
39
|
+
* or > 0 if the delta will not be applied.
|
35
40
|
*/
|
36
41
|
typedef int GIT_CALLBACK(git_apply_delta_cb)(
|
37
42
|
const git_diff_delta *delta,
|
@@ -48,27 +53,44 @@ typedef int GIT_CALLBACK(git_apply_delta_cb)(
|
|
48
53
|
*
|
49
54
|
* @param hunk The hunk to be applied
|
50
55
|
* @param payload User-specified payload
|
56
|
+
* @return 0 if the hunk is applied, < 0 if the apply process will be aborted
|
57
|
+
* or > 0 if the hunk will not be applied.
|
51
58
|
*/
|
52
59
|
typedef int GIT_CALLBACK(git_apply_hunk_cb)(
|
53
60
|
const git_diff_hunk *hunk,
|
54
61
|
void *payload);
|
55
62
|
|
56
|
-
/**
|
63
|
+
/**
|
64
|
+
* Flags controlling the behavior of `git_apply`.
|
65
|
+
*
|
66
|
+
* When the callback:
|
67
|
+
* - returns < 0, the apply process will be aborted.
|
68
|
+
* - returns > 0, the hunk will not be applied, but the apply process
|
69
|
+
* continues
|
70
|
+
* - returns 0, the hunk is applied, and the apply process continues.
|
71
|
+
*/
|
57
72
|
typedef enum {
|
58
73
|
/**
|
59
74
|
* Don't actually make changes, just test that the patch applies.
|
60
75
|
* This is the equivalent of `git apply --check`.
|
61
76
|
*/
|
62
|
-
GIT_APPLY_CHECK = (1 << 0)
|
77
|
+
GIT_APPLY_CHECK = (1 << 0)
|
63
78
|
} git_apply_flags_t;
|
64
79
|
|
65
80
|
/**
|
66
|
-
* Apply options structure
|
81
|
+
* Apply options structure.
|
82
|
+
*
|
83
|
+
* When the callback:
|
84
|
+
* - returns < 0, the apply process will be aborted.
|
85
|
+
* - returns > 0, the hunk will not be applied, but the apply process
|
86
|
+
* continues
|
87
|
+
* - returns 0, the hunk is applied, and the apply process continues.
|
67
88
|
*
|
68
89
|
* Initialize with `GIT_APPLY_OPTIONS_INIT`. Alternatively, you can
|
69
90
|
* use `git_apply_options_init`.
|
70
91
|
*
|
71
|
-
* @see git_apply_to_tree
|
92
|
+
* @see git_apply_to_tree
|
93
|
+
* @see git_apply
|
72
94
|
*/
|
73
95
|
typedef struct {
|
74
96
|
unsigned int version; /**< The version */
|
@@ -79,16 +101,29 @@ typedef struct {
|
|
79
101
|
/** When applying a patch, callback that will be made per hunk. */
|
80
102
|
git_apply_hunk_cb hunk_cb;
|
81
103
|
|
82
|
-
/** Payload passed to both delta_cb & hunk_cb
|
104
|
+
/** Payload passed to both `delta_cb` & `hunk_cb`. */
|
83
105
|
void *payload;
|
84
106
|
|
85
|
-
/** Bitmask of git_apply_flags_t */
|
107
|
+
/** Bitmask of `git_apply_flags_t` */
|
86
108
|
unsigned int flags;
|
87
109
|
} git_apply_options;
|
88
110
|
|
111
|
+
/** Current version for the `git_apply_options` structure */
|
89
112
|
#define GIT_APPLY_OPTIONS_VERSION 1
|
113
|
+
|
114
|
+
/** Static constructor for `git_apply_options` */
|
90
115
|
#define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
|
91
116
|
|
117
|
+
/**
|
118
|
+
* Initialize git_apply_options structure
|
119
|
+
*
|
120
|
+
* Initialize a `git_apply_options` with default values. Equivalent to creating
|
121
|
+
* an instance with GIT_APPLY_OPTIONS_INIT.
|
122
|
+
*
|
123
|
+
* @param opts The `git_apply_options` struct to initialize.
|
124
|
+
* @param version The struct version; pass `GIT_APPLY_OPTIONS_VERSION`
|
125
|
+
* @return 0 on success or -1 on failure.
|
126
|
+
*/
|
92
127
|
GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int version);
|
93
128
|
|
94
129
|
/**
|
@@ -127,7 +162,7 @@ typedef enum {
|
|
127
162
|
* Apply the patch to both the working directory and the index.
|
128
163
|
* This is the equivalent of `git apply --index`.
|
129
164
|
*/
|
130
|
-
GIT_APPLY_LOCATION_BOTH = 2
|
165
|
+
GIT_APPLY_LOCATION_BOTH = 2
|
131
166
|
} git_apply_location_t;
|
132
167
|
|
133
168
|
/**
|
@@ -12,9 +12,13 @@
|
|
12
12
|
|
13
13
|
/**
|
14
14
|
* @file git2/attr.h
|
15
|
-
* @brief
|
15
|
+
* @brief Attribute management routines
|
16
16
|
* @defgroup git_attr Git attribute management routines
|
17
17
|
* @ingroup Git
|
18
|
+
*
|
19
|
+
* Attributes specify additional information about how git should
|
20
|
+
* handle particular paths - for example, they may indicate whether
|
21
|
+
* a particular filter is applied, like LFS or line ending conversions.
|
18
22
|
* @{
|
19
23
|
*/
|
20
24
|
GIT_BEGIN_DECL
|
@@ -83,7 +87,7 @@ typedef enum {
|
|
83
87
|
GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
|
84
88
|
GIT_ATTR_VALUE_TRUE, /**< The attribute has been set */
|
85
89
|
GIT_ATTR_VALUE_FALSE, /**< The attribute has been unset */
|
86
|
-
GIT_ATTR_VALUE_STRING
|
90
|
+
GIT_ATTR_VALUE_STRING /**< This attribute has a value */
|
87
91
|
} git_attr_value_t;
|
88
92
|
|
89
93
|
/**
|
@@ -114,16 +118,18 @@ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
|
|
114
118
|
* use index only for creating archives or for a bare repo (if an
|
115
119
|
* index has been specified for the bare repo).
|
116
120
|
*/
|
121
|
+
|
122
|
+
/** Examine attribute in working directory, then index */
|
117
123
|
#define GIT_ATTR_CHECK_FILE_THEN_INDEX 0
|
124
|
+
/** Examine attribute in index, then working directory */
|
118
125
|
#define GIT_ATTR_CHECK_INDEX_THEN_FILE 1
|
119
|
-
|
126
|
+
/** Examine attributes only in the index */
|
127
|
+
#define GIT_ATTR_CHECK_INDEX_ONLY 2
|
120
128
|
|
121
129
|
/**
|
122
130
|
* Check attribute flags: controlling extended attribute behavior.
|
123
131
|
*
|
124
132
|
* Normally, attribute checks include looking in the /etc (or system
|
125
|
-
* equivalent) directory for a `gitattributes` file. Passing this
|
126
|
-
* flag will cause attribute checks to ignore that file.
|
127
133
|
* equivalent) directory for a `gitattributes` file. Passing the
|
128
134
|
* `GIT_ATTR_CHECK_NO_SYSTEM` flag will cause attribute checks to
|
129
135
|
* ignore that file.
|
@@ -134,8 +140,12 @@ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
|
|
134
140
|
* Passing the `GIT_ATTR_CHECK_INCLUDE_COMMIT` flag will use attributes
|
135
141
|
* from a `.gitattributes` file in a specific commit.
|
136
142
|
*/
|
143
|
+
|
144
|
+
/** Ignore system attributes */
|
137
145
|
#define GIT_ATTR_CHECK_NO_SYSTEM (1 << 2)
|
146
|
+
/** Honor `.gitattributes` in the HEAD revision */
|
138
147
|
#define GIT_ATTR_CHECK_INCLUDE_HEAD (1 << 3)
|
148
|
+
/** Honor `.gitattributes` in a specific commit */
|
139
149
|
#define GIT_ATTR_CHECK_INCLUDE_COMMIT (1 << 4)
|
140
150
|
|
141
151
|
/**
|
@@ -160,7 +170,10 @@ typedef struct {
|
|
160
170
|
git_oid attr_commit_id;
|
161
171
|
} git_attr_options;
|
162
172
|
|
173
|
+
/** Current version for the `git_attr_options` structure */
|
163
174
|
#define GIT_ATTR_OPTIONS_VERSION 1
|
175
|
+
|
176
|
+
/** Static constructor for `git_attr_options` */
|
164
177
|
#define GIT_ATTR_OPTIONS_INIT {GIT_ATTR_OPTIONS_VERSION}
|
165
178
|
|
166
179
|
/**
|
@@ -177,6 +190,7 @@ typedef struct {
|
|
177
190
|
* not have to exist, but if it does not, then it will be
|
178
191
|
* treated as a plain file (not a directory).
|
179
192
|
* @param name The name of the attribute to look up.
|
193
|
+
* @return 0 or an error code.
|
180
194
|
*/
|
181
195
|
GIT_EXTERN(int) git_attr_get(
|
182
196
|
const char **value_out,
|
@@ -199,6 +213,7 @@ GIT_EXTERN(int) git_attr_get(
|
|
199
213
|
* not have to exist, but if it does not, then it will be
|
200
214
|
* treated as a plain file (not a directory).
|
201
215
|
* @param name The name of the attribute to look up.
|
216
|
+
* @return 0 or an error code.
|
202
217
|
*/
|
203
218
|
GIT_EXTERN(int) git_attr_get_ext(
|
204
219
|
const char **value_out,
|
@@ -235,6 +250,7 @@ GIT_EXTERN(int) git_attr_get_ext(
|
|
235
250
|
* it will be treated as a plain file (i.e. not a directory).
|
236
251
|
* @param num_attr The number of attributes being looked up
|
237
252
|
* @param names An array of num_attr strings containing attribute names.
|
253
|
+
* @return 0 or an error code.
|
238
254
|
*/
|
239
255
|
GIT_EXTERN(int) git_attr_get_many(
|
240
256
|
const char **values_out,
|
@@ -259,6 +275,7 @@ GIT_EXTERN(int) git_attr_get_many(
|
|
259
275
|
* it will be treated as a plain file (i.e. not a directory).
|
260
276
|
* @param num_attr The number of attributes being looked up
|
261
277
|
* @param names An array of num_attr strings containing attribute names.
|
278
|
+
* @return 0 or an error code.
|
262
279
|
*/
|
263
280
|
GIT_EXTERN(int) git_attr_get_many_ext(
|
264
281
|
const char **values_out,
|
@@ -344,11 +361,16 @@ GIT_EXTERN(int) git_attr_cache_flush(
|
|
344
361
|
* Add a macro definition.
|
345
362
|
*
|
346
363
|
* Macros will automatically be loaded from the top level `.gitattributes`
|
347
|
-
* file of the repository (plus the
|
364
|
+
* file of the repository (plus the built-in "binary" macro). This
|
348
365
|
* function allows you to add others. For example, to add the default
|
349
366
|
* macro, you would call:
|
350
367
|
*
|
351
368
|
* git_attr_add_macro(repo, "binary", "-diff -crlf");
|
369
|
+
*
|
370
|
+
* @param repo The repository to add the macro in.
|
371
|
+
* @param name The name of the macro.
|
372
|
+
* @param values The value for the macro.
|
373
|
+
* @return 0 or an error code.
|
352
374
|
*/
|
353
375
|
GIT_EXTERN(int) git_attr_add_macro(
|
354
376
|
git_repository *repo,
|