rugged 0.27.9 → 0.27.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/AUTHORS +1 -0
- data/vendor/libgit2/CMakeLists.txt +98 -54
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +15 -1
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +9 -8
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
- data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +2 -0
- data/vendor/libgit2/deps/http-parser/{LICENSE-MIT → COPYING} +0 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +33 -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 +1420 -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 +21 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -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 +9800 -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 +421 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +1 -0
- data/vendor/libgit2/deps/zlib/COPYING +27 -0
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/include/git2.h +5 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +9 -0
- data/vendor/libgit2/include/git2/apply.h +149 -0
- data/vendor/libgit2/include/git2/attr.h +38 -20
- data/vendor/libgit2/include/git2/blame.h +42 -25
- data/vendor/libgit2/include/git2/blob.h +45 -13
- data/vendor/libgit2/include/git2/branch.h +1 -1
- data/vendor/libgit2/include/git2/buffer.h +22 -16
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +65 -32
- data/vendor/libgit2/include/git2/cherrypick.h +9 -7
- data/vendor/libgit2/include/git2/clone.h +12 -10
- data/vendor/libgit2/include/git2/commit.h +53 -3
- data/vendor/libgit2/include/git2/common.h +60 -8
- data/vendor/libgit2/include/git2/config.h +30 -19
- data/vendor/libgit2/include/git2/cred.h +308 -0
- data/vendor/libgit2/include/git2/deprecated.h +493 -0
- data/vendor/libgit2/include/git2/describe.h +32 -9
- data/vendor/libgit2/include/git2/diff.h +208 -156
- data/vendor/libgit2/include/git2/errors.h +54 -46
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/ignore.h +2 -2
- data/vendor/libgit2/include/git2/index.h +74 -52
- data/vendor/libgit2/include/git2/indexer.h +76 -6
- data/vendor/libgit2/include/git2/mailmap.h +115 -0
- data/vendor/libgit2/include/git2/merge.h +35 -18
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/notes.h +1 -1
- data/vendor/libgit2/include/git2/object.h +17 -29
- data/vendor/libgit2/include/git2/odb.h +12 -11
- data/vendor/libgit2/include/git2/odb_backend.h +10 -9
- data/vendor/libgit2/include/git2/oid.h +2 -2
- data/vendor/libgit2/include/git2/pack.h +14 -3
- data/vendor/libgit2/include/git2/proxy.h +14 -8
- data/vendor/libgit2/include/git2/rebase.h +53 -6
- data/vendor/libgit2/include/git2/refs.h +33 -15
- data/vendor/libgit2/include/git2/refspec.h +17 -0
- data/vendor/libgit2/include/git2/remote.h +123 -24
- data/vendor/libgit2/include/git2/repository.h +76 -39
- data/vendor/libgit2/include/git2/revert.h +6 -4
- data/vendor/libgit2/include/git2/revwalk.h +7 -7
- data/vendor/libgit2/include/git2/signature.h +2 -2
- data/vendor/libgit2/include/git2/stash.h +15 -12
- data/vendor/libgit2/include/git2/status.h +33 -20
- data/vendor/libgit2/include/git2/submodule.h +30 -12
- data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
- data/vendor/libgit2/include/git2/sys/commit.h +1 -1
- data/vendor/libgit2/include/git2/sys/config.h +13 -13
- data/vendor/libgit2/include/git2/sys/cred.h +90 -0
- data/vendor/libgit2/include/git2/sys/filter.h +6 -6
- data/vendor/libgit2/include/git2/sys/index.h +3 -0
- data/vendor/libgit2/include/git2/sys/mempack.h +35 -35
- data/vendor/libgit2/include/git2/sys/merge.h +9 -4
- data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -22
- data/vendor/libgit2/include/git2/sys/path.h +64 -0
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +76 -40
- data/vendor/libgit2/include/git2/sys/repository.h +5 -1
- data/vendor/libgit2/include/git2/sys/stream.h +92 -12
- data/vendor/libgit2/include/git2/sys/transport.h +129 -83
- data/vendor/libgit2/include/git2/tag.h +13 -4
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transaction.h +1 -0
- data/vendor/libgit2/include/git2/transport.h +11 -311
- data/vendor/libgit2/include/git2/tree.h +4 -4
- data/vendor/libgit2/include/git2/types.h +33 -111
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +48 -13
- data/vendor/libgit2/src/CMakeLists.txt +96 -164
- data/vendor/libgit2/src/alloc.c +43 -0
- data/vendor/libgit2/src/alloc.h +40 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +119 -0
- data/vendor/libgit2/src/{streams/curl.h → allocators/stdalloc.h} +5 -5
- 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/annotated_commit.c +15 -8
- data/vendor/libgit2/src/apply.c +537 -31
- data/vendor/libgit2/src/apply.h +3 -1
- data/vendor/libgit2/src/array.h +2 -2
- data/vendor/libgit2/src/attr.c +81 -75
- data/vendor/libgit2/src/attr_file.c +207 -121
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +51 -53
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +47 -20
- data/vendor/libgit2/src/blame.h +2 -1
- data/vendor/libgit2/src/blame_git.c +37 -20
- data/vendor/libgit2/src/blob.c +128 -42
- data/vendor/libgit2/src/blob.h +19 -2
- data/vendor/libgit2/src/branch.c +67 -43
- data/vendor/libgit2/src/buf_text.c +7 -6
- data/vendor/libgit2/src/buffer.c +69 -57
- data/vendor/libgit2/src/buffer.h +1 -1
- data/vendor/libgit2/src/cache.c +38 -45
- data/vendor/libgit2/src/cache.h +3 -3
- data/vendor/libgit2/src/cc-compat.h +20 -3
- data/vendor/libgit2/src/checkout.c +109 -90
- data/vendor/libgit2/src/cherrypick.c +15 -9
- data/vendor/libgit2/src/clone.c +49 -27
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +117 -49
- data/vendor/libgit2/src/commit.h +7 -0
- data/vendor/libgit2/src/commit_list.c +30 -78
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +27 -91
- data/vendor/libgit2/src/config.c +194 -176
- data/vendor/libgit2/src/config.h +8 -20
- data/vendor/libgit2/src/config_backend.h +96 -0
- data/vendor/libgit2/src/config_cache.c +41 -35
- data/vendor/libgit2/src/config_entries.c +229 -0
- data/vendor/libgit2/src/config_entries.h +24 -0
- data/vendor/libgit2/src/config_file.c +439 -753
- data/vendor/libgit2/src/config_mem.c +220 -0
- data/vendor/libgit2/src/config_parse.c +114 -63
- data/vendor/libgit2/src/config_parse.h +17 -16
- data/vendor/libgit2/src/config_snapshot.c +206 -0
- data/vendor/libgit2/src/crlf.c +219 -190
- data/vendor/libgit2/src/delta.c +25 -18
- data/vendor/libgit2/src/describe.c +42 -41
- data/vendor/libgit2/src/diff.c +53 -68
- data/vendor/libgit2/src/diff.h +2 -1
- data/vendor/libgit2/src/diff_driver.c +47 -49
- data/vendor/libgit2/src/diff_file.c +19 -17
- data/vendor/libgit2/src/diff_file.h +1 -1
- data/vendor/libgit2/src/diff_generate.c +162 -106
- data/vendor/libgit2/src/diff_generate.h +3 -3
- data/vendor/libgit2/src/diff_parse.c +4 -4
- data/vendor/libgit2/src/diff_print.c +42 -30
- data/vendor/libgit2/src/diff_stats.c +22 -7
- data/vendor/libgit2/src/diff_tform.c +16 -16
- data/vendor/libgit2/src/diff_xdiff.c +15 -3
- data/vendor/libgit2/src/errors.c +51 -39
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +11 -3
- data/vendor/libgit2/src/fetch.c +10 -5
- data/vendor/libgit2/src/fetchhead.c +17 -17
- data/vendor/libgit2/src/filebuf.c +32 -36
- data/vendor/libgit2/src/filebuf.h +2 -2
- data/vendor/libgit2/src/filter.c +46 -38
- data/vendor/libgit2/src/filter.h +0 -10
- data/vendor/libgit2/src/{fileops.c → futils.c} +80 -73
- data/vendor/libgit2/src/{fileops.h → futils.h} +6 -6
- data/vendor/libgit2/src/global.c +48 -63
- data/vendor/libgit2/src/global.h +0 -2
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +20 -19
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +48 -0
- data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +17 -17
- 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 -10
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +46 -0
- data/vendor/libgit2/src/hash/sha1/mbedtls.h +19 -0
- data/vendor/libgit2/src/hash/sha1/openssl.c +59 -0
- data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
- 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} +47 -37
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +5 -5
- data/vendor/libgit2/src/idxmap.c +107 -61
- data/vendor/libgit2/src/idxmap.h +153 -31
- data/vendor/libgit2/src/ignore.c +43 -47
- data/vendor/libgit2/src/index.c +337 -232
- data/vendor/libgit2/src/index.h +17 -1
- data/vendor/libgit2/src/indexer.c +346 -175
- data/vendor/libgit2/src/integer.h +71 -26
- data/vendor/libgit2/src/iterator.c +142 -70
- data/vendor/libgit2/src/iterator.h +15 -0
- data/vendor/libgit2/src/khash.h +3 -1
- data/vendor/libgit2/src/mailmap.c +485 -0
- data/vendor/libgit2/src/mailmap.h +35 -0
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +144 -100
- data/vendor/libgit2/src/merge_driver.c +11 -11
- data/vendor/libgit2/src/merge_file.c +2 -2
- data/vendor/libgit2/src/mwindow.c +24 -29
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +184 -0
- data/vendor/libgit2/src/net.h +36 -0
- data/vendor/libgit2/src/netops.c +55 -156
- data/vendor/libgit2/src/netops.h +3 -23
- data/vendor/libgit2/src/notes.c +16 -11
- data/vendor/libgit2/src/object.c +120 -69
- data/vendor/libgit2/src/object.h +22 -9
- data/vendor/libgit2/src/object_api.c +8 -8
- data/vendor/libgit2/src/odb.c +116 -93
- data/vendor/libgit2/src/odb.h +8 -7
- data/vendor/libgit2/src/odb_loose.c +62 -55
- data/vendor/libgit2/src/odb_mempack.c +21 -34
- data/vendor/libgit2/src/odb_pack.c +18 -14
- data/vendor/libgit2/src/offmap.c +53 -35
- data/vendor/libgit2/src/offmap.h +108 -21
- data/vendor/libgit2/src/oid.c +12 -7
- data/vendor/libgit2/src/oidmap.c +49 -47
- data/vendor/libgit2/src/oidmap.h +101 -24
- data/vendor/libgit2/src/pack-objects.c +88 -87
- data/vendor/libgit2/src/pack-objects.h +2 -8
- data/vendor/libgit2/src/pack.c +99 -101
- data/vendor/libgit2/src/pack.h +17 -19
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +4 -4
- data/vendor/libgit2/src/patch_generate.c +20 -20
- data/vendor/libgit2/src/patch_parse.c +151 -63
- data/vendor/libgit2/src/path.c +169 -125
- data/vendor/libgit2/src/path.h +3 -71
- data/vendor/libgit2/src/pathspec.c +19 -19
- data/vendor/libgit2/src/pool.c +26 -22
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +10 -10
- data/vendor/libgit2/src/posix.h +12 -1
- data/vendor/libgit2/src/proxy.c +8 -3
- data/vendor/libgit2/src/push.c +37 -31
- data/vendor/libgit2/src/push.h +2 -1
- data/vendor/libgit2/src/reader.c +265 -0
- data/vendor/libgit2/src/reader.h +107 -0
- data/vendor/libgit2/src/rebase.c +115 -59
- data/vendor/libgit2/src/refdb.c +15 -3
- data/vendor/libgit2/src/refdb_fs.c +381 -254
- data/vendor/libgit2/src/reflog.c +13 -15
- data/vendor/libgit2/src/refs.c +118 -88
- data/vendor/libgit2/src/refs.h +5 -3
- data/vendor/libgit2/src/refspec.c +56 -37
- data/vendor/libgit2/src/refspec.h +1 -1
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +266 -215
- data/vendor/libgit2/src/remote.h +11 -2
- data/vendor/libgit2/src/repository.c +280 -225
- data/vendor/libgit2/src/repository.h +52 -40
- data/vendor/libgit2/src/reset.c +8 -8
- data/vendor/libgit2/src/revert.c +14 -9
- data/vendor/libgit2/src/revparse.c +47 -48
- data/vendor/libgit2/src/revwalk.c +120 -57
- data/vendor/libgit2/src/revwalk.h +22 -1
- data/vendor/libgit2/src/settings.c +47 -10
- data/vendor/libgit2/src/signature.c +11 -11
- data/vendor/libgit2/src/sortedcache.c +22 -36
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +125 -99
- data/vendor/libgit2/src/status.c +28 -22
- data/vendor/libgit2/src/stream.h +17 -2
- data/vendor/libgit2/src/streams/mbedtls.c +483 -0
- data/vendor/libgit2/src/streams/mbedtls.h +23 -0
- data/vendor/libgit2/src/streams/openssl.c +224 -114
- data/vendor/libgit2/src/streams/openssl.h +4 -108
- data/vendor/libgit2/src/streams/registry.c +118 -0
- data/vendor/libgit2/src/streams/registry.h +19 -0
- data/vendor/libgit2/src/streams/socket.c +55 -30
- data/vendor/libgit2/src/streams/stransport.c +57 -32
- data/vendor/libgit2/src/streams/stransport.h +5 -0
- data/vendor/libgit2/src/streams/tls.c +50 -19
- data/vendor/libgit2/src/streams/tls.h +12 -4
- data/vendor/libgit2/src/strmap.c +47 -74
- data/vendor/libgit2/src/strmap.h +108 -33
- data/vendor/libgit2/src/submodule.c +272 -216
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +29 -19
- data/vendor/libgit2/src/tag.c +41 -28
- data/vendor/libgit2/src/tag.h +2 -1
- data/vendor/libgit2/src/trace.c +2 -2
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +52 -38
- data/vendor/libgit2/src/transaction.c +30 -29
- data/vendor/libgit2/src/transport.c +5 -5
- data/vendor/libgit2/src/transports/auth.c +15 -11
- data/vendor/libgit2/src/transports/auth.h +10 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +33 -18
- 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 +35 -0
- data/vendor/libgit2/src/transports/cred.c +24 -24
- data/vendor/libgit2/src/transports/git.c +26 -31
- data/vendor/libgit2/src/transports/http.c +881 -348
- data/vendor/libgit2/src/transports/http.h +2 -0
- data/vendor/libgit2/src/transports/local.c +35 -35
- data/vendor/libgit2/src/transports/smart.c +70 -47
- data/vendor/libgit2/src/transports/smart.h +3 -4
- data/vendor/libgit2/src/transports/smart_pkt.c +43 -40
- data/vendor/libgit2/src/transports/smart_protocol.c +96 -116
- data/vendor/libgit2/src/transports/ssh.c +77 -66
- data/vendor/libgit2/src/transports/winhttp.c +318 -314
- data/vendor/libgit2/src/tree-cache.c +19 -12
- data/vendor/libgit2/src/tree.c +103 -142
- data/vendor/libgit2/src/tree.h +1 -12
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +70 -56
- data/vendor/libgit2/src/util.h +28 -156
- data/vendor/libgit2/src/vector.c +4 -4
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/dir.c +3 -3
- data/vendor/libgit2/src/win32/findfile.c +3 -3
- data/vendor/libgit2/src/win32/map.c +9 -11
- data/vendor/libgit2/src/win32/msvc-compat.h +6 -0
- data/vendor/libgit2/src/win32/path_w32.c +113 -9
- data/vendor/libgit2/src/win32/path_w32.h +18 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +70 -45
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -10
- data/vendor/libgit2/src/win32/w32_buffer.c +9 -5
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +3 -2
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +26 -75
- data/vendor/libgit2/src/win32/w32_stack.c +6 -11
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +27 -64
- data/vendor/libgit2/src/win32/w32_util.h +5 -49
- data/vendor/libgit2/src/worktree.c +95 -60
- data/vendor/libgit2/src/worktree.h +2 -0
- data/vendor/libgit2/src/xdiff/xdiffi.c +7 -5
- data/vendor/libgit2/src/xdiff/xhistogram.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +27 -15
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +4 -4
- metadata +122 -33
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- 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/config_file.h +0 -73
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +0 -47
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -59
- data/vendor/libgit2/src/streams/curl.c +0 -385
@@ -11,15 +11,22 @@
|
|
11
11
|
# include <openssl/err.h>
|
12
12
|
#endif
|
13
13
|
|
14
|
+
#ifdef GIT_MBEDTLS
|
15
|
+
# include <mbedtls/error.h>
|
16
|
+
#endif
|
17
|
+
|
14
18
|
#include <git2.h>
|
19
|
+
#include "alloc.h"
|
15
20
|
#include "sysdir.h"
|
16
21
|
#include "cache.h"
|
17
22
|
#include "global.h"
|
18
23
|
#include "object.h"
|
19
24
|
#include "odb.h"
|
20
25
|
#include "refs.h"
|
26
|
+
#include "index.h"
|
21
27
|
#include "transports/smart.h"
|
22
28
|
#include "streams/openssl.h"
|
29
|
+
#include "streams/mbedtls.h"
|
23
30
|
|
24
31
|
void git_libgit2_version(int *major, int *minor, int *rev)
|
25
32
|
{
|
@@ -49,6 +56,8 @@ int git_libgit2_features(void)
|
|
49
56
|
/* Declarations for tuneable settings */
|
50
57
|
extern size_t git_mwindow__window_size;
|
51
58
|
extern size_t git_mwindow__mapped_limit;
|
59
|
+
extern size_t git_indexer__max_objects;
|
60
|
+
extern bool git_disable_pack_keep_file_checks;
|
52
61
|
|
53
62
|
static int config_level_to_sysdir(int config_level)
|
54
63
|
{
|
@@ -68,8 +77,8 @@ static int config_level_to_sysdir(int config_level)
|
|
68
77
|
val = GIT_SYSDIR_PROGRAMDATA;
|
69
78
|
break;
|
70
79
|
default:
|
71
|
-
|
72
|
-
|
80
|
+
git_error_set(
|
81
|
+
GIT_ERROR_INVALID, "invalid config path selector %d", config_level);
|
73
82
|
}
|
74
83
|
|
75
84
|
return val;
|
@@ -132,7 +141,7 @@ int git_libgit2_opts(int key, ...)
|
|
132
141
|
|
133
142
|
case GIT_OPT_SET_CACHE_OBJECT_LIMIT:
|
134
143
|
{
|
135
|
-
|
144
|
+
git_object_t type = (git_object_t)va_arg(ap, int);
|
136
145
|
size_t size = va_arg(ap, size_t);
|
137
146
|
error = git_cache_set_max_object_size(type, size);
|
138
147
|
break;
|
@@ -175,8 +184,17 @@ int git_libgit2_opts(int key, ...)
|
|
175
184
|
const char *path = va_arg(ap, const char *);
|
176
185
|
error = git_openssl__set_cert_location(file, path);
|
177
186
|
}
|
187
|
+
#elif defined(GIT_MBEDTLS)
|
188
|
+
{
|
189
|
+
const char *file = va_arg(ap, const char *);
|
190
|
+
const char *path = va_arg(ap, const char *);
|
191
|
+
if (file)
|
192
|
+
error = git_mbedtls__set_cert_location(file, 0);
|
193
|
+
if (error && path)
|
194
|
+
error = git_mbedtls__set_cert_location(path, 1);
|
195
|
+
}
|
178
196
|
#else
|
179
|
-
|
197
|
+
git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support certificate locations");
|
180
198
|
error = -1;
|
181
199
|
#endif
|
182
200
|
break;
|
@@ -184,7 +202,7 @@ int git_libgit2_opts(int key, ...)
|
|
184
202
|
git__free(git__user_agent);
|
185
203
|
git__user_agent = git__strdup(va_arg(ap, const char *));
|
186
204
|
if (!git__user_agent) {
|
187
|
-
|
205
|
+
git_error_set_oom();
|
188
206
|
error = -1;
|
189
207
|
}
|
190
208
|
|
@@ -199,17 +217,17 @@ int git_libgit2_opts(int key, ...)
|
|
199
217
|
break;
|
200
218
|
|
201
219
|
case GIT_OPT_SET_SSL_CIPHERS:
|
202
|
-
#
|
220
|
+
#if (GIT_OPENSSL || GIT_MBEDTLS)
|
203
221
|
{
|
204
222
|
git__free(git__ssl_ciphers);
|
205
223
|
git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
|
206
224
|
if (!git__ssl_ciphers) {
|
207
|
-
|
225
|
+
git_error_set_oom();
|
208
226
|
error = -1;
|
209
227
|
}
|
210
228
|
}
|
211
229
|
#else
|
212
|
-
|
230
|
+
git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support custom ciphers");
|
213
231
|
error = -1;
|
214
232
|
#endif
|
215
233
|
break;
|
@@ -246,8 +264,28 @@ int git_libgit2_opts(int key, ...)
|
|
246
264
|
git_odb__strict_hash_verification = (va_arg(ap, int) != 0);
|
247
265
|
break;
|
248
266
|
|
267
|
+
case GIT_OPT_SET_ALLOCATOR:
|
268
|
+
error = git_allocator_setup(va_arg(ap, git_allocator *));
|
269
|
+
break;
|
270
|
+
|
271
|
+
case GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY:
|
272
|
+
git_index__enforce_unsaved_safety = (va_arg(ap, int) != 0);
|
273
|
+
break;
|
274
|
+
|
275
|
+
case GIT_OPT_SET_PACK_MAX_OBJECTS:
|
276
|
+
git_indexer__max_objects = va_arg(ap, size_t);
|
277
|
+
break;
|
278
|
+
|
279
|
+
case GIT_OPT_GET_PACK_MAX_OBJECTS:
|
280
|
+
*(va_arg(ap, size_t *)) = git_indexer__max_objects;
|
281
|
+
break;
|
282
|
+
|
283
|
+
case GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS:
|
284
|
+
git_disable_pack_keep_file_checks = (va_arg(ap, int) != 0);
|
285
|
+
break;
|
286
|
+
|
249
287
|
default:
|
250
|
-
|
288
|
+
git_error_set(GIT_ERROR_INVALID, "invalid option key");
|
251
289
|
error = -1;
|
252
290
|
}
|
253
291
|
|
@@ -255,4 +293,3 @@ int git_libgit2_opts(int key, ...)
|
|
255
293
|
|
256
294
|
return error;
|
257
295
|
}
|
258
|
-
|
@@ -25,7 +25,7 @@ void git_signature_free(git_signature *sig)
|
|
25
25
|
|
26
26
|
static int signature_error(const char *msg)
|
27
27
|
{
|
28
|
-
|
28
|
+
git_error_set(GIT_ERROR_INVALID, "failed to parse signature - %s", msg);
|
29
29
|
return -1;
|
30
30
|
}
|
31
31
|
|
@@ -76,12 +76,12 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema
|
|
76
76
|
}
|
77
77
|
|
78
78
|
p = git__calloc(1, sizeof(git_signature));
|
79
|
-
|
79
|
+
GIT_ERROR_CHECK_ALLOC(p);
|
80
80
|
|
81
81
|
p->name = extract_trimmed(name, strlen(name));
|
82
|
-
|
82
|
+
GIT_ERROR_CHECK_ALLOC(p->name);
|
83
83
|
p->email = extract_trimmed(email, strlen(email));
|
84
|
-
|
84
|
+
GIT_ERROR_CHECK_ALLOC(p->email);
|
85
85
|
|
86
86
|
if (p->name[0] == '\0' || p->email[0] == '\0') {
|
87
87
|
git_signature_free(p);
|
@@ -104,13 +104,13 @@ int git_signature_dup(git_signature **dest, const git_signature *source)
|
|
104
104
|
return 0;
|
105
105
|
|
106
106
|
signature = git__calloc(1, sizeof(git_signature));
|
107
|
-
|
107
|
+
GIT_ERROR_CHECK_ALLOC(signature);
|
108
108
|
|
109
109
|
signature->name = git__strdup(source->name);
|
110
|
-
|
110
|
+
GIT_ERROR_CHECK_ALLOC(signature->name);
|
111
111
|
|
112
112
|
signature->email = git__strdup(source->email);
|
113
|
-
|
113
|
+
GIT_ERROR_CHECK_ALLOC(signature->email);
|
114
114
|
|
115
115
|
signature->when.time = source->when.time;
|
116
116
|
signature->when.offset = source->when.offset;
|
@@ -129,13 +129,13 @@ int git_signature__pdup(git_signature **dest, const git_signature *source, git_p
|
|
129
129
|
return 0;
|
130
130
|
|
131
131
|
signature = git_pool_mallocz(pool, sizeof(git_signature));
|
132
|
-
|
132
|
+
GIT_ERROR_CHECK_ALLOC(signature);
|
133
133
|
|
134
134
|
signature->name = git_pool_strdup(pool, source->name);
|
135
|
-
|
135
|
+
GIT_ERROR_CHECK_ALLOC(signature->name);
|
136
136
|
|
137
137
|
signature->email = git_pool_strdup(pool, source->email);
|
138
|
-
|
138
|
+
GIT_ERROR_CHECK_ALLOC(signature->email);
|
139
139
|
|
140
140
|
signature->when.time = source->when.time;
|
141
141
|
signature->when.offset = source->when.offset;
|
@@ -284,7 +284,7 @@ int git_signature_from_buffer(git_signature **out, const char *buf)
|
|
284
284
|
*out = NULL;
|
285
285
|
|
286
286
|
sig = git__calloc(1, sizeof(git_signature));
|
287
|
-
|
287
|
+
GIT_ERROR_CHECK_ALLOC(sig);
|
288
288
|
|
289
289
|
buf_end = buf + strlen(buf);
|
290
290
|
error = git_signature__parse(sig, &buf, buf_end, NULL, '\0');
|
@@ -20,19 +20,19 @@ int git_sortedcache_new(
|
|
20
20
|
|
21
21
|
pathlen = path ? strlen(path) : 0;
|
22
22
|
|
23
|
-
|
24
|
-
|
23
|
+
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen);
|
24
|
+
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
|
25
25
|
sc = git__calloc(1, alloclen);
|
26
|
-
|
26
|
+
GIT_ERROR_CHECK_ALLOC(sc);
|
27
27
|
|
28
28
|
git_pool_init(&sc->pool, 1);
|
29
29
|
|
30
30
|
if (git_vector_init(&sc->items, 4, item_cmp) < 0 ||
|
31
|
-
|
31
|
+
git_strmap_new(&sc->map) < 0)
|
32
32
|
goto fail;
|
33
33
|
|
34
34
|
if (git_rwlock_init(&sc->lock)) {
|
35
|
-
|
35
|
+
git_error_set(GIT_ERROR_OS, "failed to initialize lock");
|
36
36
|
goto fail;
|
37
37
|
}
|
38
38
|
|
@@ -167,7 +167,7 @@ int git_sortedcache_wlock(git_sortedcache *sc)
|
|
167
167
|
GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
|
168
168
|
|
169
169
|
if (git_rwlock_wrlock(&sc->lock) < 0) {
|
170
|
-
|
170
|
+
git_error_set(GIT_ERROR_OS, "unable to acquire write lock on cache");
|
171
171
|
return -1;
|
172
172
|
}
|
173
173
|
return 0;
|
@@ -186,7 +186,7 @@ int git_sortedcache_rlock(git_sortedcache *sc)
|
|
186
186
|
GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
|
187
187
|
|
188
188
|
if (git_rwlock_rdlock(&sc->lock) < 0) {
|
189
|
-
|
189
|
+
git_error_set(GIT_ERROR_OS, "unable to acquire read lock on cache");
|
190
190
|
return -1;
|
191
191
|
}
|
192
192
|
return 0;
|
@@ -219,14 +219,14 @@ int git_sortedcache_lockandload(git_sortedcache *sc, git_buf *buf)
|
|
219
219
|
}
|
220
220
|
|
221
221
|
if (p_fstat(fd, &st) < 0) {
|
222
|
-
|
222
|
+
git_error_set(GIT_ERROR_OS, "failed to stat file");
|
223
223
|
error = -1;
|
224
224
|
(void)p_close(fd);
|
225
225
|
goto unlock;
|
226
226
|
}
|
227
227
|
|
228
228
|
if (!git__is_sizet(st.st_size)) {
|
229
|
-
|
229
|
+
git_error_set(GIT_ERROR_INVALID, "unable to load file larger than size_t");
|
230
230
|
error = -1;
|
231
231
|
(void)p_close(fd);
|
232
232
|
goto unlock;
|
@@ -270,24 +270,20 @@ int git_sortedcache_clear(git_sortedcache *sc, bool wlock)
|
|
270
270
|
/* find and/or insert item, returning pointer to item data */
|
271
271
|
int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
|
272
272
|
{
|
273
|
-
int error = 0;
|
274
|
-
khiter_t pos;
|
275
|
-
void *item;
|
276
273
|
size_t keylen, itemlen;
|
274
|
+
int error = 0;
|
277
275
|
char *item_key;
|
276
|
+
void *item;
|
278
277
|
|
279
|
-
|
280
|
-
if (git_strmap_valid_index(sc->map, pos)) {
|
281
|
-
item = git_strmap_value_at(sc->map, pos);
|
278
|
+
if ((item = git_strmap_get(sc->map, key)) != NULL)
|
282
279
|
goto done;
|
283
|
-
}
|
284
280
|
|
285
281
|
keylen = strlen(key);
|
286
282
|
itemlen = sc->item_path_offset + keylen + 1;
|
287
283
|
itemlen = (itemlen + 7) & ~7;
|
288
284
|
|
289
|
-
if ((item = git_pool_mallocz(&sc->pool,
|
290
|
-
/* don't use
|
285
|
+
if ((item = git_pool_mallocz(&sc->pool, itemlen)) == NULL) {
|
286
|
+
/* don't use GIT_ERROR_CHECK_ALLOC b/c of lock */
|
291
287
|
error = -1;
|
292
288
|
goto done;
|
293
289
|
}
|
@@ -299,17 +295,11 @@ int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
|
|
299
295
|
item_key = ((char *)item) + sc->item_path_offset;
|
300
296
|
memcpy(item_key, key, keylen);
|
301
297
|
|
302
|
-
|
303
|
-
if (error < 0)
|
298
|
+
if ((error = git_strmap_set(sc->map, item_key, item)) < 0)
|
304
299
|
goto done;
|
305
300
|
|
306
|
-
if (
|
307
|
-
|
308
|
-
git_strmap_set_value_at(sc->map, pos, item);
|
309
|
-
|
310
|
-
error = git_vector_insert(&sc->items, item);
|
311
|
-
if (error < 0)
|
312
|
-
git_strmap_delete_at(sc->map, pos);
|
301
|
+
if ((error = git_vector_insert(&sc->items, item)) < 0)
|
302
|
+
git_strmap_delete(sc->map, item_key);
|
313
303
|
|
314
304
|
done:
|
315
305
|
if (out)
|
@@ -320,10 +310,7 @@ done:
|
|
320
310
|
/* lookup item by key */
|
321
311
|
void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key)
|
322
312
|
{
|
323
|
-
|
324
|
-
if (git_strmap_valid_index(sc->map, pos))
|
325
|
-
return git_strmap_value_at(sc->map, pos);
|
326
|
-
return NULL;
|
313
|
+
return git_strmap_get(sc->map, key);
|
327
314
|
}
|
328
315
|
|
329
316
|
/* find out how many items are in the cache */
|
@@ -371,21 +358,20 @@ int git_sortedcache_lookup_index(
|
|
371
358
|
int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
|
372
359
|
{
|
373
360
|
char *item;
|
374
|
-
khiter_t mappos;
|
375
361
|
|
376
|
-
/*
|
362
|
+
/*
|
363
|
+
* Because of pool allocation, this can't actually remove the item,
|
377
364
|
* but we can remove it from the items vector and the hash table.
|
378
365
|
*/
|
379
366
|
|
380
367
|
if ((item = git_vector_get(&sc->items, pos)) == NULL) {
|
381
|
-
|
368
|
+
git_error_set(GIT_ERROR_INVALID, "removing item out of range");
|
382
369
|
return GIT_ENOTFOUND;
|
383
370
|
}
|
384
371
|
|
385
372
|
(void)git_vector_remove(&sc->items, pos);
|
386
373
|
|
387
|
-
|
388
|
-
git_strmap_delete_at(sc->map, mappos);
|
374
|
+
git_strmap_delete(sc->map, item + sc->item_path_offset);
|
389
375
|
|
390
376
|
if (sc->free_item)
|
391
377
|
sc->free_item(sc->free_item_payload, item);
|
data/vendor/libgit2/src/stash.c
CHANGED
@@ -12,6 +12,7 @@
|
|
12
12
|
#include "message.h"
|
13
13
|
#include "tree.h"
|
14
14
|
#include "reflog.h"
|
15
|
+
#include "blob.h"
|
15
16
|
#include "git2/diff.h"
|
16
17
|
#include "git2/stash.h"
|
17
18
|
#include "git2/status.h"
|
@@ -28,7 +29,7 @@
|
|
28
29
|
|
29
30
|
static int create_error(int error, const char *msg)
|
30
31
|
{
|
31
|
-
|
32
|
+
git_error_set(GIT_ERROR_STASH, "cannot stash changes - %s", msg);
|
32
33
|
return error;
|
33
34
|
}
|
34
35
|
|
@@ -47,7 +48,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
|
|
47
48
|
char *formatted_oid;
|
48
49
|
|
49
50
|
formatted_oid = git_oid_allocfmt(b_commit);
|
50
|
-
|
51
|
+
GIT_ERROR_CHECK_ALLOC(formatted_oid);
|
51
52
|
|
52
53
|
git_buf_put(out, formatted_oid, 7);
|
53
54
|
git__free(formatted_oid);
|
@@ -58,7 +59,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
|
|
58
59
|
static int append_commit_description(git_buf *out, git_commit* commit)
|
59
60
|
{
|
60
61
|
const char *summary = git_commit_summary(commit);
|
61
|
-
|
62
|
+
GIT_ERROR_CHECK_ALLOC(summary);
|
62
63
|
|
63
64
|
if (append_abbreviated_oid(out, git_commit_id(commit)) < 0)
|
64
65
|
return -1;
|
@@ -103,19 +104,23 @@ cleanup:
|
|
103
104
|
return error;
|
104
105
|
}
|
105
106
|
|
106
|
-
static int build_tree_from_index(
|
107
|
+
static int build_tree_from_index(
|
108
|
+
git_tree **out,
|
109
|
+
git_repository *repo,
|
110
|
+
git_index *index)
|
107
111
|
{
|
108
112
|
int error;
|
109
113
|
git_oid i_tree_oid;
|
110
114
|
|
111
|
-
if ((error =
|
115
|
+
if ((error = git_index_write_tree_to(&i_tree_oid, index, repo)) < 0)
|
112
116
|
return error;
|
113
117
|
|
114
|
-
return git_tree_lookup(out,
|
118
|
+
return git_tree_lookup(out, repo, &i_tree_oid);
|
115
119
|
}
|
116
120
|
|
117
121
|
static int commit_index(
|
118
122
|
git_commit **i_commit,
|
123
|
+
git_repository *repo,
|
119
124
|
git_index *index,
|
120
125
|
const git_signature *stasher,
|
121
126
|
const char *message,
|
@@ -126,7 +131,7 @@ static int commit_index(
|
|
126
131
|
git_buf msg = GIT_BUF_INIT;
|
127
132
|
int error;
|
128
133
|
|
129
|
-
if ((error = build_tree_from_index(&i_tree, index)) < 0)
|
134
|
+
if ((error = build_tree_from_index(&i_tree, repo, index)) < 0)
|
130
135
|
goto cleanup;
|
131
136
|
|
132
137
|
if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0)
|
@@ -149,7 +154,7 @@ static int commit_index(
|
|
149
154
|
|
150
155
|
cleanup:
|
151
156
|
git_tree_free(i_tree);
|
152
|
-
|
157
|
+
git_buf_dispose(&msg);
|
153
158
|
return error;
|
154
159
|
}
|
155
160
|
|
@@ -159,7 +164,38 @@ struct stash_update_rules {
|
|
159
164
|
bool include_ignored;
|
160
165
|
};
|
161
166
|
|
167
|
+
/*
|
168
|
+
* Similar to git_index_add_bypath but able to operate on any
|
169
|
+
* index without making assumptions about the repository's index
|
170
|
+
*/
|
171
|
+
static int stash_to_index(
|
172
|
+
git_repository *repo,
|
173
|
+
git_index *index,
|
174
|
+
const char *path)
|
175
|
+
{
|
176
|
+
git_index *repo_index;
|
177
|
+
git_index_entry entry = {{0}};
|
178
|
+
struct stat st;
|
179
|
+
int error;
|
180
|
+
|
181
|
+
if (!git_repository_is_bare(repo) &&
|
182
|
+
(error = git_repository_index__weakptr(&repo_index, repo)) < 0)
|
183
|
+
return error;
|
184
|
+
|
185
|
+
if ((error = git_blob__create_from_paths(
|
186
|
+
&entry.id, &st, repo, NULL, path, 0, true)) < 0)
|
187
|
+
return error;
|
188
|
+
|
189
|
+
git_index_entry__init_from_stat(&entry, &st,
|
190
|
+
(repo_index != NULL || !repo_index->distrust_filemode));
|
191
|
+
|
192
|
+
entry.path = path;
|
193
|
+
|
194
|
+
return git_index_add(index, &entry);
|
195
|
+
}
|
196
|
+
|
162
197
|
static int stash_update_index_from_diff(
|
198
|
+
git_repository *repo,
|
163
199
|
git_index *index,
|
164
200
|
const git_diff *diff,
|
165
201
|
struct stash_update_rules *data)
|
@@ -197,15 +233,15 @@ static int stash_update_index_from_diff(
|
|
197
233
|
|
198
234
|
default:
|
199
235
|
/* Unimplemented */
|
200
|
-
|
201
|
-
|
236
|
+
git_error_set(
|
237
|
+
GIT_ERROR_INVALID,
|
202
238
|
"cannot update index. Unimplemented status (%d)",
|
203
239
|
delta->status);
|
204
240
|
return -1;
|
205
241
|
}
|
206
242
|
|
207
243
|
if (add_path != NULL)
|
208
|
-
error =
|
244
|
+
error = stash_to_index(repo, index, add_path);
|
209
245
|
}
|
210
246
|
|
211
247
|
return error;
|
@@ -213,17 +249,19 @@ static int stash_update_index_from_diff(
|
|
213
249
|
|
214
250
|
static int build_untracked_tree(
|
215
251
|
git_tree **tree_out,
|
216
|
-
|
252
|
+
git_repository *repo,
|
217
253
|
git_commit *i_commit,
|
218
254
|
uint32_t flags)
|
219
255
|
{
|
256
|
+
git_index *i_index = NULL;
|
220
257
|
git_tree *i_tree = NULL;
|
221
258
|
git_diff *diff = NULL;
|
222
259
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
223
260
|
struct stash_update_rules data = {0};
|
224
261
|
int error;
|
225
262
|
|
226
|
-
|
263
|
+
if ((error = git_index_new(&i_index)) < 0)
|
264
|
+
goto cleanup;
|
227
265
|
|
228
266
|
if (flags & GIT_STASH_INCLUDE_UNTRACKED) {
|
229
267
|
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
|
@@ -240,24 +278,24 @@ static int build_untracked_tree(
|
|
240
278
|
if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
|
241
279
|
goto cleanup;
|
242
280
|
|
243
|
-
if ((error = git_diff_tree_to_workdir(
|
244
|
-
&diff, git_index_owner(index), i_tree, &opts)) < 0)
|
281
|
+
if ((error = git_diff_tree_to_workdir(&diff, repo, i_tree, &opts)) < 0)
|
245
282
|
goto cleanup;
|
246
283
|
|
247
|
-
if ((error = stash_update_index_from_diff(
|
284
|
+
if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
|
248
285
|
goto cleanup;
|
249
286
|
|
250
|
-
error = build_tree_from_index(tree_out,
|
287
|
+
error = build_tree_from_index(tree_out, repo, i_index);
|
251
288
|
|
252
289
|
cleanup:
|
253
290
|
git_diff_free(diff);
|
254
291
|
git_tree_free(i_tree);
|
292
|
+
git_index_free(i_index);
|
255
293
|
return error;
|
256
294
|
}
|
257
295
|
|
258
296
|
static int commit_untracked(
|
259
297
|
git_commit **u_commit,
|
260
|
-
|
298
|
+
git_repository *repo,
|
261
299
|
const git_signature *stasher,
|
262
300
|
const char *message,
|
263
301
|
git_commit *i_commit,
|
@@ -268,7 +306,7 @@ static int commit_untracked(
|
|
268
306
|
git_buf msg = GIT_BUF_INIT;
|
269
307
|
int error;
|
270
308
|
|
271
|
-
if ((error = build_untracked_tree(&u_tree,
|
309
|
+
if ((error = build_untracked_tree(&u_tree, repo, i_commit, flags)) < 0)
|
272
310
|
goto cleanup;
|
273
311
|
|
274
312
|
if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0)
|
@@ -276,7 +314,7 @@ static int commit_untracked(
|
|
276
314
|
|
277
315
|
if ((error = git_commit_create(
|
278
316
|
&u_commit_oid,
|
279
|
-
|
317
|
+
repo,
|
280
318
|
NULL,
|
281
319
|
stasher,
|
282
320
|
stasher,
|
@@ -287,11 +325,11 @@ static int commit_untracked(
|
|
287
325
|
NULL)) < 0)
|
288
326
|
goto cleanup;
|
289
327
|
|
290
|
-
error = git_commit_lookup(u_commit,
|
328
|
+
error = git_commit_lookup(u_commit, repo, &u_commit_oid);
|
291
329
|
|
292
330
|
cleanup:
|
293
331
|
git_tree_free(u_tree);
|
294
|
-
|
332
|
+
git_buf_dispose(&msg);
|
295
333
|
return error;
|
296
334
|
}
|
297
335
|
|
@@ -316,10 +354,10 @@ static git_diff_delta *stash_delta_merge(
|
|
316
354
|
|
317
355
|
static int build_workdir_tree(
|
318
356
|
git_tree **tree_out,
|
319
|
-
|
357
|
+
git_repository *repo,
|
358
|
+
git_index *i_index,
|
320
359
|
git_commit *b_commit)
|
321
360
|
{
|
322
|
-
git_repository *repo = git_index_owner(index);
|
323
361
|
git_tree *b_tree = NULL;
|
324
362
|
git_diff *diff = NULL, *idx_to_wd = NULL;
|
325
363
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
@@ -331,17 +369,17 @@ static int build_workdir_tree(
|
|
331
369
|
if ((error = git_commit_tree(&b_tree, b_commit)) < 0)
|
332
370
|
goto cleanup;
|
333
371
|
|
334
|
-
if ((error = git_diff_tree_to_index(&diff, repo, b_tree,
|
335
|
-
(error = git_diff_index_to_workdir(&idx_to_wd, repo,
|
372
|
+
if ((error = git_diff_tree_to_index(&diff, repo, b_tree, i_index, &opts)) < 0 ||
|
373
|
+
(error = git_diff_index_to_workdir(&idx_to_wd, repo, i_index, &opts)) < 0 ||
|
336
374
|
(error = git_diff__merge(diff, idx_to_wd, stash_delta_merge)) < 0)
|
337
375
|
goto cleanup;
|
338
376
|
|
339
377
|
data.include_changed = true;
|
340
378
|
|
341
|
-
if ((error = stash_update_index_from_diff(
|
379
|
+
if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
|
342
380
|
goto cleanup;
|
343
381
|
|
344
|
-
error = build_tree_from_index(tree_out,
|
382
|
+
error = build_tree_from_index(tree_out, repo, i_index);
|
345
383
|
|
346
384
|
cleanup:
|
347
385
|
git_diff_free(idx_to_wd);
|
@@ -353,33 +391,36 @@ cleanup:
|
|
353
391
|
|
354
392
|
static int commit_worktree(
|
355
393
|
git_oid *w_commit_oid,
|
356
|
-
|
394
|
+
git_repository *repo,
|
357
395
|
const git_signature *stasher,
|
358
396
|
const char *message,
|
359
397
|
git_commit *i_commit,
|
360
398
|
git_commit *b_commit,
|
361
399
|
git_commit *u_commit)
|
362
400
|
{
|
363
|
-
|
364
|
-
|
365
|
-
|
401
|
+
const git_commit *parents[] = { NULL, NULL, NULL };
|
402
|
+
git_index *i_index = NULL, *r_index = NULL;
|
403
|
+
git_tree *w_tree = NULL;
|
404
|
+
int error = 0, ignorecase;
|
366
405
|
|
367
406
|
parents[0] = b_commit;
|
368
407
|
parents[1] = i_commit;
|
369
408
|
parents[2] = u_commit;
|
370
409
|
|
371
|
-
if ((error =
|
410
|
+
if ((error = git_repository_index(&r_index, repo) < 0) ||
|
411
|
+
(error = git_index_new(&i_index)) < 0 ||
|
412
|
+
(error = git_index__fill(i_index, &r_index->entries) < 0) ||
|
413
|
+
(error = git_repository__configmap_lookup(&ignorecase, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
|
372
414
|
goto cleanup;
|
373
415
|
|
374
|
-
|
375
|
-
goto cleanup;
|
416
|
+
git_index__set_ignore_case(i_index, ignorecase);
|
376
417
|
|
377
|
-
if ((error = build_workdir_tree(&w_tree,
|
418
|
+
if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
|
378
419
|
goto cleanup;
|
379
420
|
|
380
421
|
error = git_commit_create(
|
381
422
|
w_commit_oid,
|
382
|
-
|
423
|
+
repo,
|
383
424
|
NULL,
|
384
425
|
stasher,
|
385
426
|
stasher,
|
@@ -390,41 +431,39 @@ static int commit_worktree(
|
|
390
431
|
parents);
|
391
432
|
|
392
433
|
cleanup:
|
393
|
-
git_tree_free(i_tree);
|
394
434
|
git_tree_free(w_tree);
|
435
|
+
git_index_free(i_index);
|
436
|
+
git_index_free(r_index);
|
395
437
|
return error;
|
396
438
|
}
|
397
439
|
|
398
|
-
static int prepare_worktree_commit_message(
|
399
|
-
git_buf* msg,
|
400
|
-
const char *user_message)
|
440
|
+
static int prepare_worktree_commit_message(git_buf *out, const char *user_message)
|
401
441
|
{
|
402
442
|
git_buf buf = GIT_BUF_INIT;
|
403
|
-
int error;
|
404
|
-
|
405
|
-
if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0)
|
406
|
-
return error;
|
407
|
-
|
408
|
-
git_buf_clear(msg);
|
443
|
+
int error = 0;
|
409
444
|
|
410
|
-
if (!user_message)
|
411
|
-
git_buf_printf(
|
412
|
-
else {
|
445
|
+
if (!user_message) {
|
446
|
+
git_buf_printf(&buf, "WIP on %s", git_buf_cstr(out));
|
447
|
+
} else {
|
413
448
|
const char *colon;
|
414
449
|
|
415
|
-
if ((colon = strchr(git_buf_cstr(
|
450
|
+
if ((colon = strchr(git_buf_cstr(out), ':')) == NULL)
|
416
451
|
goto cleanup;
|
417
452
|
|
418
|
-
git_buf_puts(
|
419
|
-
git_buf_put(
|
420
|
-
git_buf_printf(
|
453
|
+
git_buf_puts(&buf, "On ");
|
454
|
+
git_buf_put(&buf, git_buf_cstr(out), colon - out->ptr);
|
455
|
+
git_buf_printf(&buf, ": %s\n", user_message);
|
456
|
+
}
|
457
|
+
|
458
|
+
if (git_buf_oom(&buf)) {
|
459
|
+
error = -1;
|
460
|
+
goto cleanup;
|
421
461
|
}
|
422
462
|
|
423
|
-
|
463
|
+
git_buf_swap(out, &buf);
|
424
464
|
|
425
465
|
cleanup:
|
426
|
-
|
427
|
-
|
466
|
+
git_buf_dispose(&buf);
|
428
467
|
return error;
|
429
468
|
}
|
430
469
|
|
@@ -455,10 +494,7 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
|
|
455
494
|
return GIT_PASSTHROUGH;
|
456
495
|
}
|
457
496
|
|
458
|
-
static int ensure_there_are_changes_to_stash(
|
459
|
-
git_repository *repo,
|
460
|
-
bool include_untracked_files,
|
461
|
-
bool include_ignored_files)
|
497
|
+
static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flags)
|
462
498
|
{
|
463
499
|
int error;
|
464
500
|
git_status_options opts = GIT_STATUS_OPTIONS_INIT;
|
@@ -466,11 +502,11 @@ static int ensure_there_are_changes_to_stash(
|
|
466
502
|
opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
|
467
503
|
opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
|
468
504
|
|
469
|
-
if (
|
505
|
+
if (flags & GIT_STASH_INCLUDE_UNTRACKED)
|
470
506
|
opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
|
471
507
|
GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
|
472
508
|
|
473
|
-
if (
|
509
|
+
if (flags & GIT_STASH_INCLUDE_IGNORED)
|
474
510
|
opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
|
475
511
|
GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
|
476
512
|
|
@@ -485,20 +521,14 @@ static int ensure_there_are_changes_to_stash(
|
|
485
521
|
return error;
|
486
522
|
}
|
487
523
|
|
488
|
-
static int reset_index_and_workdir(
|
489
|
-
git_repository *repo,
|
490
|
-
git_commit *commit,
|
491
|
-
bool remove_untracked,
|
492
|
-
bool remove_ignored)
|
524
|
+
static int reset_index_and_workdir(git_repository *repo, git_commit *commit, uint32_t flags)
|
493
525
|
{
|
494
526
|
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
|
495
527
|
|
496
528
|
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
|
497
|
-
|
498
|
-
if (remove_untracked)
|
529
|
+
if (flags & GIT_STASH_INCLUDE_UNTRACKED)
|
499
530
|
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
|
500
|
-
|
501
|
-
if (remove_ignored)
|
531
|
+
if (flags & GIT_STASH_INCLUDE_IGNORED)
|
502
532
|
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
|
503
533
|
|
504
534
|
return git_checkout_tree(repo, (git_object *)commit, &opts);
|
@@ -524,31 +554,26 @@ int git_stash_save(
|
|
524
554
|
if ((error = retrieve_base_commit_and_message(&b_commit, &msg, repo)) < 0)
|
525
555
|
goto cleanup;
|
526
556
|
|
527
|
-
if ((error = ensure_there_are_changes_to_stash(
|
528
|
-
repo,
|
529
|
-
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
|
530
|
-
(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
|
557
|
+
if ((error = ensure_there_are_changes_to_stash(repo, flags)) < 0)
|
531
558
|
goto cleanup;
|
532
559
|
|
533
560
|
if ((error = git_repository_index(&index, repo)) < 0)
|
534
561
|
goto cleanup;
|
535
562
|
|
536
|
-
if ((error = commit_index(
|
537
|
-
|
563
|
+
if ((error = commit_index(&i_commit, repo, index, stasher,
|
564
|
+
git_buf_cstr(&msg), b_commit)) < 0)
|
538
565
|
goto cleanup;
|
539
566
|
|
540
567
|
if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
|
541
|
-
|
542
|
-
|
543
|
-
i_commit, flags)) < 0)
|
568
|
+
(error = commit_untracked(&u_commit, repo, stasher,
|
569
|
+
git_buf_cstr(&msg), i_commit, flags)) < 0)
|
544
570
|
goto cleanup;
|
545
571
|
|
546
572
|
if ((error = prepare_worktree_commit_message(&msg, message)) < 0)
|
547
573
|
goto cleanup;
|
548
574
|
|
549
|
-
if ((error = commit_worktree(
|
550
|
-
|
551
|
-
i_commit, b_commit, u_commit)) < 0)
|
575
|
+
if ((error = commit_worktree(out, repo, stasher, git_buf_cstr(&msg),
|
576
|
+
i_commit, b_commit, u_commit)) < 0)
|
552
577
|
goto cleanup;
|
553
578
|
|
554
579
|
git_buf_rtrim(&msg);
|
@@ -556,16 +581,13 @@ int git_stash_save(
|
|
556
581
|
if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
|
557
582
|
goto cleanup;
|
558
583
|
|
559
|
-
if ((error = reset_index_and_workdir(
|
560
|
-
|
561
|
-
((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
|
562
|
-
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
|
563
|
-
(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
|
584
|
+
if ((error = reset_index_and_workdir(repo, (flags & GIT_STASH_KEEP_INDEX) ? i_commit : b_commit,
|
585
|
+
flags)) < 0)
|
564
586
|
goto cleanup;
|
565
587
|
|
566
588
|
cleanup:
|
567
589
|
|
568
|
-
|
590
|
+
git_buf_dispose(&msg);
|
569
591
|
git_commit_free(i_commit);
|
570
592
|
git_commit_free(b_commit);
|
571
593
|
git_commit_free(u_commit);
|
@@ -594,7 +616,7 @@ static int retrieve_stash_commit(
|
|
594
616
|
max = git_reflog_entrycount(reflog);
|
595
617
|
if (!max || index > max - 1) {
|
596
618
|
error = GIT_ENOTFOUND;
|
597
|
-
|
619
|
+
git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
|
598
620
|
goto cleanup;
|
599
621
|
}
|
600
622
|
|
@@ -738,8 +760,7 @@ static void normalize_apply_options(
|
|
738
760
|
memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options));
|
739
761
|
}
|
740
762
|
|
741
|
-
|
742
|
-
opts->checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
|
763
|
+
opts->checkout_options.checkout_strategy |= GIT_CHECKOUT_NO_REFRESH;
|
743
764
|
|
744
765
|
if (!opts->checkout_options.our_label)
|
745
766
|
opts->checkout_options.our_label = "Updated upstream";
|
@@ -748,13 +769,18 @@ static void normalize_apply_options(
|
|
748
769
|
opts->checkout_options.their_label = "Stashed changes";
|
749
770
|
}
|
750
771
|
|
751
|
-
int
|
772
|
+
int git_stash_apply_options_init(git_stash_apply_options *opts, unsigned int version)
|
752
773
|
{
|
753
774
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
754
775
|
opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT);
|
755
776
|
return 0;
|
756
777
|
}
|
757
778
|
|
779
|
+
int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
|
780
|
+
{
|
781
|
+
return git_stash_apply_options_init(opts, version);
|
782
|
+
}
|
783
|
+
|
758
784
|
#define NOTIFY_PROGRESS(opts, progress_type) \
|
759
785
|
do { \
|
760
786
|
if ((opts).progress_cb && \
|
@@ -776,7 +802,7 @@ static int ensure_clean_index(git_repository *repo, git_index *index)
|
|
776
802
|
goto done;
|
777
803
|
|
778
804
|
if (git_diff_num_deltas(index_diff) > 0) {
|
779
|
-
|
805
|
+
git_error_set(GIT_ERROR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
|
780
806
|
git_diff_num_deltas(index_diff));
|
781
807
|
error = GIT_EUNCOMMITTED;
|
782
808
|
}
|
@@ -848,7 +874,7 @@ int git_stash_apply(
|
|
848
874
|
git_index *untracked_index = NULL;
|
849
875
|
int error;
|
850
876
|
|
851
|
-
|
877
|
+
GIT_ERROR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
|
852
878
|
|
853
879
|
normalize_apply_options(&opts, given_opts);
|
854
880
|
checkout_strategy = opts.checkout_options.checkout_strategy;
|
@@ -981,7 +1007,7 @@ int git_stash_foreach(
|
|
981
1007
|
|
982
1008
|
error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE);
|
983
1009
|
if (error == GIT_ENOTFOUND) {
|
984
|
-
|
1010
|
+
git_error_clear();
|
985
1011
|
return 0;
|
986
1012
|
}
|
987
1013
|
if (error < 0)
|
@@ -1000,7 +1026,7 @@ int git_stash_foreach(
|
|
1000
1026
|
payload);
|
1001
1027
|
|
1002
1028
|
if (error) {
|
1003
|
-
|
1029
|
+
git_error_set_after_callback(error);
|
1004
1030
|
break;
|
1005
1031
|
}
|
1006
1032
|
}
|
@@ -1037,7 +1063,7 @@ int git_stash_drop(
|
|
1037
1063
|
|
1038
1064
|
if (!max || index > max - 1) {
|
1039
1065
|
error = GIT_ENOTFOUND;
|
1040
|
-
|
1066
|
+
git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
|
1041
1067
|
goto cleanup;
|
1042
1068
|
}
|
1043
1069
|
|