rugged 0.28.5 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/ext/rugged/extconf.rb +3 -1
- data/ext/rugged/rugged.c +35 -31
- data/ext/rugged/rugged.h +13 -0
- data/ext/rugged/rugged_blob.c +11 -9
- data/ext/rugged/rugged_commit.c +18 -16
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_diff.c +4 -26
- data/ext/rugged/rugged_index.c +4 -2
- data/ext/rugged/rugged_note.c +5 -3
- data/ext/rugged/rugged_object.c +57 -10
- data/ext/rugged/rugged_rebase.c +3 -1
- data/ext/rugged/rugged_remote.c +32 -8
- data/ext/rugged/rugged_repo.c +232 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/commit.rb +17 -4
- data/lib/rugged/repository.rb +5 -6
- data/lib/rugged/submodule_collection.rb +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +57 -75
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/{Modules/AddCFlagIfSupported.cmake → AddCFlagIfSupported.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/EnableWarnings.cmake → EnableWarnings.cmake} +5 -1
- data/vendor/libgit2/cmake/{Modules/FindCoreFoundation.cmake → FindCoreFoundation.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindGSSAPI.cmake → FindGSSAPI.cmake} +1 -1
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/{Modules/FindHTTP_Parser.cmake → FindHTTP_Parser.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindIconv.cmake → FindIconv.cmake} +0 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/{Modules/FindPkgLibraries.cmake → FindPkgLibraries.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindSecurity.cmake → FindSecurity.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindStatNsec.cmake → FindStatNsec.cmake} +6 -0
- data/vendor/libgit2/cmake/{Modules/FindmbedTLS.cmake → FindmbedTLS.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/IdeSplitSources.cmake → IdeSplitSources.cmake} +0 -0
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +77 -0
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -0
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +48 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +120 -0
- data/vendor/libgit2/cmake/SelectHashes.cmake +61 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +4 -3
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +25 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +28 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1419 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +35 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +15 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/LICENCE +93 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9812 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +420 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -5
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/deps/zlib/deflate.c +1 -0
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +1 -1
- data/vendor/libgit2/include/git2/apply.h +24 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +4 -2
- data/vendor/libgit2/include/git2/blob.h +61 -13
- data/vendor/libgit2/include/git2/branch.h +74 -57
- data/vendor/libgit2/include/git2/buffer.h +20 -14
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +46 -14
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +2 -2
- data/vendor/libgit2/include/git2/commit.h +23 -1
- data/vendor/libgit2/include/git2/common.h +34 -8
- data/vendor/libgit2/include/git2/config.h +13 -13
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
- data/vendor/libgit2/include/git2/credential.h +314 -0
- data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
- data/vendor/libgit2/include/git2/deprecated.h +362 -4
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +17 -15
- data/vendor/libgit2/include/git2/errors.h +5 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +5 -5
- data/vendor/libgit2/include/git2/indexer.h +49 -4
- data/vendor/libgit2/include/git2/merge.h +6 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/object.h +2 -14
- data/vendor/libgit2/include/git2/odb.h +18 -22
- data/vendor/libgit2/include/git2/odb_backend.h +5 -4
- data/vendor/libgit2/include/git2/oid.h +11 -6
- data/vendor/libgit2/include/git2/pack.h +13 -2
- data/vendor/libgit2/include/git2/proxy.h +6 -4
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +22 -3
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +124 -58
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +25 -16
- data/vendor/libgit2/include/git2/strarray.h +6 -10
- data/vendor/libgit2/include/git2/submodule.h +20 -3
- data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
- data/vendor/libgit2/include/git2/sys/cred.h +15 -0
- data/vendor/libgit2/include/git2/sys/credential.h +90 -0
- data/vendor/libgit2/include/git2/sys/index.h +4 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
- data/vendor/libgit2/include/git2/sys/merge.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +164 -21
- data/vendor/libgit2/include/git2/sys/repository.h +17 -6
- data/vendor/libgit2/include/git2/sys/transport.h +4 -4
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -340
- data/vendor/libgit2/include/git2/tree.h +7 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +5 -5
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +147 -272
- data/vendor/libgit2/src/alloc.c +2 -14
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/apply.c +36 -16
- data/vendor/libgit2/src/assert_safe.h +58 -0
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +197 -99
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +48 -49
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +34 -15
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +27 -10
- data/vendor/libgit2/src/blob.c +92 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +68 -42
- data/vendor/libgit2/src/buffer.c +11 -3
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +34 -58
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +73 -86
- data/vendor/libgit2/src/cherrypick.c +9 -1
- data/vendor/libgit2/src/clone.c +130 -27
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +70 -22
- data/vendor/libgit2/src/commit.h +6 -0
- data/vendor/libgit2/src/commit_list.c +28 -76
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +4 -75
- data/vendor/libgit2/src/config.c +34 -47
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +42 -39
- data/vendor/libgit2/src/config_entries.c +76 -98
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +346 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +50 -30
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +207 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +26 -21
- data/vendor/libgit2/src/diff.c +53 -75
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +15 -11
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +36 -37
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +3 -4
- data/vendor/libgit2/src/diff_print.c +86 -71
- data/vendor/libgit2/src/diff_stats.c +13 -12
- data/vendor/libgit2/src/diff_tform.c +15 -16
- data/vendor/libgit2/src/errors.c +23 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +9 -2
- data/vendor/libgit2/src/fetchhead.c +9 -9
- data/vendor/libgit2/src/filebuf.c +1 -1
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +19 -11
- data/vendor/libgit2/src/{fileops.c → futils.c} +23 -20
- data/vendor/libgit2/src/{fileops.h → futils.h} +8 -8
- data/vendor/libgit2/src/global.c +3 -1
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +19 -21
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
- data/vendor/libgit2/src/{sha1_lookup.h → hash/sha1/collisiondetect.h} +8 -8
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
- data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
- data/vendor/libgit2/src/{refdb_fs.h → hash/sha1/openssl.h} +8 -8
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/idxmap.c +73 -69
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +123 -95
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +99 -78
- data/vendor/libgit2/src/integer.h +26 -4
- data/vendor/libgit2/src/iterator.c +36 -32
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +93 -57
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +5 -7
- data/vendor/libgit2/src/midx.c +418 -0
- data/vendor/libgit2/src/midx.h +83 -0
- data/vendor/libgit2/src/mwindow.c +144 -74
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +416 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -222
- data/vendor/libgit2/src/netops.h +1 -37
- data/vendor/libgit2/src/notes.c +8 -5
- data/vendor/libgit2/src/object.c +5 -4
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +54 -32
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +20 -13
- data/vendor/libgit2/src/odb_mempack.c +15 -24
- data/vendor/libgit2/src/odb_pack.c +4 -5
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +21 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +55 -52
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +160 -149
- data/vendor/libgit2/src/pack.h +32 -18
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +1 -1
- data/vendor/libgit2/src/patch_generate.c +2 -4
- data/vendor/libgit2/src/patch_parse.c +34 -11
- data/vendor/libgit2/src/path.c +47 -10
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +18 -17
- data/vendor/libgit2/src/pool.c +42 -32
- data/vendor/libgit2/src/pool.h +15 -7
- data/vendor/libgit2/src/posix.c +39 -16
- data/vendor/libgit2/src/posix.h +21 -1
- data/vendor/libgit2/src/proxy.c +9 -2
- data/vendor/libgit2/src/push.c +15 -7
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +89 -28
- data/vendor/libgit2/src/refdb.c +147 -0
- data/vendor/libgit2/src/refdb.h +69 -0
- data/vendor/libgit2/src/refdb_fs.c +230 -241
- data/vendor/libgit2/src/reflog.c +13 -19
- data/vendor/libgit2/src/refs.c +113 -217
- data/vendor/libgit2/src/refs.h +10 -21
- data/vendor/libgit2/src/refspec.c +57 -48
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +102 -79
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +322 -203
- data/vendor/libgit2/src/repository.h +49 -57
- data/vendor/libgit2/src/revert.c +8 -1
- data/vendor/libgit2/src/revparse.c +23 -23
- data/vendor/libgit2/src/revwalk.c +73 -37
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +22 -1
- data/vendor/libgit2/src/sortedcache.c +14 -29
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +49 -67
- data/vendor/libgit2/src/status.c +19 -11
- data/vendor/libgit2/src/strarray.c +63 -0
- data/vendor/libgit2/src/streams/openssl.c +66 -8
- data/vendor/libgit2/src/streams/registry.c +5 -3
- data/vendor/libgit2/src/streams/socket.c +2 -2
- data/vendor/libgit2/src/strmap.c +37 -84
- data/vendor/libgit2/src/strmap.h +105 -33
- data/vendor/libgit2/src/submodule.c +157 -130
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +4 -20
- data/vendor/libgit2/src/sysdir.h +0 -11
- data/vendor/libgit2/src/tag.c +12 -2
- data/vendor/libgit2/src/thread-utils.h +163 -40
- data/vendor/libgit2/src/trace.c +1 -1
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +5 -9
- data/vendor/libgit2/src/transports/auth.c +16 -15
- data/vendor/libgit2/src/transports/auth.h +18 -11
- data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
- data/vendor/libgit2/src/transports/credential.c +478 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +23 -8
- data/vendor/libgit2/src/transports/git.c +11 -16
- data/vendor/libgit2/src/transports/http.c +488 -1248
- data/vendor/libgit2/src/transports/http.h +4 -1
- data/vendor/libgit2/src/transports/httpclient.c +1552 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +12 -12
- data/vendor/libgit2/src/transports/smart.c +21 -21
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
- data/vendor/libgit2/src/transports/ssh.c +77 -59
- data/vendor/libgit2/src/transports/winhttp.c +368 -285
- data/vendor/libgit2/src/tree-cache.c +14 -7
- data/vendor/libgit2/src/tree.c +16 -26
- data/vendor/libgit2/src/unix/map.c +1 -1
- data/vendor/libgit2/src/unix/posix.h +16 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +75 -110
- data/vendor/libgit2/src/util.h +18 -23
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/git2.rc +18 -3
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +42 -5
- data/vendor/libgit2/src/win32/path_w32.h +15 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +117 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +4 -9
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +31 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -32
- data/vendor/libgit2/src/worktree.c +91 -50
- data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +5 -0
- data/vendor/libgit2/src/zstream.h +1 -0
- metadata +123 -53
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +0 -29
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +0 -96
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/COPYING +0 -502
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/sha1_lookup.c +0 -35
- data/vendor/libgit2/src/transports/cred.c +0 -390
data/vendor/libgit2/src/alloc.c
CHANGED
@@ -7,11 +7,8 @@
|
|
7
7
|
|
8
8
|
#include "alloc.h"
|
9
9
|
|
10
|
-
#
|
11
|
-
#
|
12
|
-
#else
|
13
|
-
# include "stdalloc.h"
|
14
|
-
#endif
|
10
|
+
#include "allocators/stdalloc.h"
|
11
|
+
#include "allocators/win32_crtdbg.h"
|
15
12
|
|
16
13
|
git_allocator git__allocator;
|
17
14
|
|
@@ -44,12 +41,3 @@ int git_allocator_setup(git_allocator *allocator)
|
|
44
41
|
memcpy(&git__allocator, allocator, sizeof(*allocator));
|
45
42
|
return 0;
|
46
43
|
}
|
47
|
-
|
48
|
-
#if !defined(GIT_MSVC_CRTDBG)
|
49
|
-
int git_win32_crtdbg_init_allocator(git_allocator *allocator)
|
50
|
-
{
|
51
|
-
GIT_UNUSED(allocator);
|
52
|
-
git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
|
53
|
-
return -1;
|
54
|
-
}
|
55
|
-
#endif
|
@@ -88,11 +88,10 @@ static void *stdalloc__reallocarray(void *ptr, size_t nelem, size_t elsize, cons
|
|
88
88
|
{
|
89
89
|
size_t newsize;
|
90
90
|
|
91
|
-
|
92
|
-
|
91
|
+
if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
|
92
|
+
return NULL;
|
93
93
|
|
94
|
-
return
|
95
|
-
NULL : realloc(ptr, newsize);
|
94
|
+
return stdalloc__realloc(ptr, newsize, file, line);
|
96
95
|
}
|
97
96
|
|
98
97
|
static void *stdalloc__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
|
@@ -5,13 +5,13 @@
|
|
5
5
|
* a Linking Exception. For full terms see the included COPYING file.
|
6
6
|
*/
|
7
7
|
|
8
|
-
#ifndef
|
9
|
-
#define
|
10
|
-
|
11
|
-
#include "alloc.h"
|
8
|
+
#ifndef INCLUDE_allocators_stdalloc_h__
|
9
|
+
#define INCLUDE_allocators_stdalloc_h__
|
12
10
|
|
13
11
|
#include "common.h"
|
14
12
|
|
13
|
+
#include "alloc.h"
|
14
|
+
|
15
15
|
int git_stdalloc_init_allocator(git_allocator *allocator);
|
16
16
|
|
17
17
|
#endif
|
@@ -0,0 +1,118 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include "win32_crtdbg.h"
|
9
|
+
|
10
|
+
#if defined(GIT_MSVC_CRTDBG)
|
11
|
+
|
12
|
+
#include "win32/w32_crtdbg_stacktrace.h"
|
13
|
+
|
14
|
+
static void *crtdbg__malloc(size_t len, const char *file, int line)
|
15
|
+
{
|
16
|
+
void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
17
|
+
if (!ptr) git_error_set_oom();
|
18
|
+
return ptr;
|
19
|
+
}
|
20
|
+
|
21
|
+
static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
|
22
|
+
{
|
23
|
+
void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
24
|
+
if (!ptr) git_error_set_oom();
|
25
|
+
return ptr;
|
26
|
+
}
|
27
|
+
|
28
|
+
static char *crtdbg__strdup(const char *str, const char *file, int line)
|
29
|
+
{
|
30
|
+
char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
31
|
+
if (!ptr) git_error_set_oom();
|
32
|
+
return ptr;
|
33
|
+
}
|
34
|
+
|
35
|
+
static char *crtdbg__strndup(const char *str, size_t n, const char *file, int line)
|
36
|
+
{
|
37
|
+
size_t length = 0, alloclength;
|
38
|
+
char *ptr;
|
39
|
+
|
40
|
+
length = p_strnlen(str, n);
|
41
|
+
|
42
|
+
if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
|
43
|
+
!(ptr = crtdbg__malloc(alloclength, file, line)))
|
44
|
+
return NULL;
|
45
|
+
|
46
|
+
if (length)
|
47
|
+
memcpy(ptr, str, length);
|
48
|
+
|
49
|
+
ptr[length] = '\0';
|
50
|
+
|
51
|
+
return ptr;
|
52
|
+
}
|
53
|
+
|
54
|
+
static char *crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
|
55
|
+
{
|
56
|
+
char *ptr;
|
57
|
+
size_t alloclen;
|
58
|
+
|
59
|
+
if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
|
60
|
+
!(ptr = crtdbg__malloc(alloclen, file, line)))
|
61
|
+
return NULL;
|
62
|
+
|
63
|
+
memcpy(ptr, start, n);
|
64
|
+
ptr[n] = '\0';
|
65
|
+
return ptr;
|
66
|
+
}
|
67
|
+
|
68
|
+
static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
|
69
|
+
{
|
70
|
+
void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
71
|
+
if (!new_ptr) git_error_set_oom();
|
72
|
+
return new_ptr;
|
73
|
+
}
|
74
|
+
|
75
|
+
static void *crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
|
76
|
+
{
|
77
|
+
size_t newsize;
|
78
|
+
|
79
|
+
if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
|
80
|
+
return NULL;
|
81
|
+
|
82
|
+
return crtdbg__realloc(ptr, newsize, file, line);
|
83
|
+
}
|
84
|
+
|
85
|
+
static void *crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
|
86
|
+
{
|
87
|
+
return crtdbg__reallocarray(NULL, nelem, elsize, file, line);
|
88
|
+
}
|
89
|
+
|
90
|
+
static void crtdbg__free(void *ptr)
|
91
|
+
{
|
92
|
+
free(ptr);
|
93
|
+
}
|
94
|
+
|
95
|
+
int git_win32_crtdbg_init_allocator(git_allocator *allocator)
|
96
|
+
{
|
97
|
+
allocator->gmalloc = crtdbg__malloc;
|
98
|
+
allocator->gcalloc = crtdbg__calloc;
|
99
|
+
allocator->gstrdup = crtdbg__strdup;
|
100
|
+
allocator->gstrndup = crtdbg__strndup;
|
101
|
+
allocator->gsubstrdup = crtdbg__substrdup;
|
102
|
+
allocator->grealloc = crtdbg__realloc;
|
103
|
+
allocator->greallocarray = crtdbg__reallocarray;
|
104
|
+
allocator->gmallocarray = crtdbg__mallocarray;
|
105
|
+
allocator->gfree = crtdbg__free;
|
106
|
+
return 0;
|
107
|
+
}
|
108
|
+
|
109
|
+
#else
|
110
|
+
|
111
|
+
int git_win32_crtdbg_init_allocator(git_allocator *allocator)
|
112
|
+
{
|
113
|
+
GIT_UNUSED(allocator);
|
114
|
+
git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
|
115
|
+
return -1;
|
116
|
+
}
|
117
|
+
|
118
|
+
#endif
|
@@ -4,13 +4,14 @@
|
|
4
4
|
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
5
|
* a Linking Exception. For full terms see the included COPYING file.
|
6
6
|
*/
|
7
|
-
|
8
|
-
#
|
7
|
+
|
8
|
+
#ifndef INCLUDE_allocators_crtdbg_h
|
9
|
+
#define INCLUDE_allocators_crtdbg_h
|
9
10
|
|
10
11
|
#include "common.h"
|
11
12
|
|
12
|
-
#include "
|
13
|
+
#include "alloc.h"
|
13
14
|
|
14
|
-
|
15
|
+
int git_win32_crtdbg_init_allocator(git_allocator *allocator);
|
15
16
|
|
16
17
|
#endif
|
data/vendor/libgit2/src/apply.c
CHANGED
@@ -7,8 +7,6 @@
|
|
7
7
|
|
8
8
|
#include "apply.h"
|
9
9
|
|
10
|
-
#include <assert.h>
|
11
|
-
|
12
10
|
#include "git2/apply.h"
|
13
11
|
#include "git2/patch.h"
|
14
12
|
#include "git2/filter.h"
|
@@ -18,15 +16,12 @@
|
|
18
16
|
#include "git2/repository.h"
|
19
17
|
#include "array.h"
|
20
18
|
#include "patch.h"
|
21
|
-
#include "
|
19
|
+
#include "futils.h"
|
22
20
|
#include "delta.h"
|
23
21
|
#include "zstream.h"
|
24
22
|
#include "reader.h"
|
25
23
|
#include "index.h"
|
26
24
|
|
27
|
-
#define apply_err(...) \
|
28
|
-
( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), GIT_EAPPLYFAIL )
|
29
|
-
|
30
25
|
typedef struct {
|
31
26
|
/* The lines that we allocate ourself are allocated out of the pool.
|
32
27
|
* (Lines may have been allocated out of the diff.)
|
@@ -35,6 +30,18 @@ typedef struct {
|
|
35
30
|
git_vector lines;
|
36
31
|
} patch_image;
|
37
32
|
|
33
|
+
static int apply_err(const char *fmt, ...) GIT_FORMAT_PRINTF(1, 2);
|
34
|
+
static int apply_err(const char *fmt, ...)
|
35
|
+
{
|
36
|
+
va_list ap;
|
37
|
+
|
38
|
+
va_start(ap, fmt);
|
39
|
+
git_error_vset(GIT_ERROR_PATCH, fmt, ap);
|
40
|
+
va_end(ap);
|
41
|
+
|
42
|
+
return GIT_EAPPLYFAIL;
|
43
|
+
}
|
44
|
+
|
38
45
|
static void patch_line_init(
|
39
46
|
git_diff_line *out,
|
40
47
|
const char *in,
|
@@ -56,7 +63,11 @@ static int patch_image_init_fromstr(
|
|
56
63
|
|
57
64
|
memset(out, 0x0, sizeof(patch_image));
|
58
65
|
|
59
|
-
git_pool_init(&out->pool, sizeof(git_diff_line))
|
66
|
+
if (git_pool_init(&out->pool, sizeof(git_diff_line)) < 0)
|
67
|
+
return -1;
|
68
|
+
|
69
|
+
if (!in_len)
|
70
|
+
return 0;
|
60
71
|
|
61
72
|
for (start = in; start < in + in_len; start = end) {
|
62
73
|
end = memchr(start, '\n', in_len - (start - in));
|
@@ -450,7 +461,6 @@ static int apply_one(
|
|
450
461
|
git_filemode_t pre_filemode;
|
451
462
|
git_index_entry pre_entry, post_entry;
|
452
463
|
bool skip_preimage = false;
|
453
|
-
size_t pos;
|
454
464
|
int error;
|
455
465
|
|
456
466
|
if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
|
@@ -475,8 +485,7 @@ static int apply_one(
|
|
475
485
|
*/
|
476
486
|
if (delta->status != GIT_DELTA_RENAMED &&
|
477
487
|
delta->status != GIT_DELTA_ADDED) {
|
478
|
-
|
479
|
-
if (git_strmap_valid_index(removed_paths, pos)) {
|
488
|
+
if (git_strmap_exists(removed_paths, delta->old_file.path)) {
|
480
489
|
error = apply_err("path '%s' has been renamed or deleted", delta->old_file.path);
|
481
490
|
goto done;
|
482
491
|
}
|
@@ -545,7 +554,7 @@ static int apply_one(
|
|
545
554
|
if (delta->status != GIT_DELTA_DELETED) {
|
546
555
|
if ((error = git_apply__patch(&post_contents, &filename, &mode,
|
547
556
|
pre_contents.ptr, pre_contents.size, patch, opts)) < 0 ||
|
548
|
-
(error =
|
557
|
+
(error = git_blob_create_from_buffer(&post_id, repo,
|
549
558
|
post_contents.ptr, post_contents.size)) < 0)
|
550
559
|
goto done;
|
551
560
|
|
@@ -560,7 +569,7 @@ static int apply_one(
|
|
560
569
|
|
561
570
|
if (delta->status == GIT_DELTA_RENAMED ||
|
562
571
|
delta->status == GIT_DELTA_DELETED)
|
563
|
-
|
572
|
+
error = git_strmap_set(removed_paths, delta->old_file.path, (char *) delta->old_file.path);
|
564
573
|
|
565
574
|
if (delta->status == GIT_DELTA_RENAMED ||
|
566
575
|
delta->status == GIT_DELTA_ADDED)
|
@@ -588,7 +597,7 @@ static int apply_deltas(
|
|
588
597
|
size_t i;
|
589
598
|
int error = 0;
|
590
599
|
|
591
|
-
if (
|
600
|
+
if (git_strmap_new(&removed_paths) < 0)
|
592
601
|
return -1;
|
593
602
|
|
594
603
|
for (i = 0; i < git_diff_num_deltas(diff); i++) {
|
@@ -761,6 +770,13 @@ done:
|
|
761
770
|
return error;
|
762
771
|
}
|
763
772
|
|
773
|
+
int git_apply_options_init(git_apply_options *opts, unsigned int version)
|
774
|
+
{
|
775
|
+
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
776
|
+
opts, version, git_apply_options, GIT_APPLY_OPTIONS_INIT);
|
777
|
+
return 0;
|
778
|
+
}
|
779
|
+
|
764
780
|
/*
|
765
781
|
* Handle the three application options ("locations"):
|
766
782
|
*
|
@@ -831,13 +847,17 @@ int git_apply(
|
|
831
847
|
(error = git_reader_for_index(&post_reader, repo, postimage)) < 0)
|
832
848
|
goto done;
|
833
849
|
|
834
|
-
if ((
|
835
|
-
|
836
|
-
|
850
|
+
if (!(opts.flags & GIT_APPLY_CHECK))
|
851
|
+
if ((error = git_repository_index(&index, repo)) < 0 ||
|
852
|
+
(error = git_indexwriter_init(&indexwriter, index)) < 0)
|
853
|
+
goto done;
|
837
854
|
|
838
855
|
if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
|
839
856
|
goto done;
|
840
857
|
|
858
|
+
if ((opts.flags & GIT_APPLY_CHECK))
|
859
|
+
goto done;
|
860
|
+
|
841
861
|
switch (location) {
|
842
862
|
case GIT_APPLY_LOCATION_BOTH:
|
843
863
|
error = git_apply__to_workdir(repo, diff, preimage, postimage, location, &opts);
|
@@ -0,0 +1,58 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
#ifndef INCLUDE_assert_safe_h__
|
8
|
+
#define INCLUDE_assert_safe_h__
|
9
|
+
|
10
|
+
/*
|
11
|
+
* In a debug build, we'll assert(3) for aide in debugging. In release
|
12
|
+
* builds, we will provide macros that will set an error message that
|
13
|
+
* indicate a failure and return. Note that memory leaks can occur in
|
14
|
+
* a release-mode assertion failure -- it is impractical to provide
|
15
|
+
* safe clean up routines in these very extreme failures, but care
|
16
|
+
* should be taken to not leak very large objects.
|
17
|
+
*/
|
18
|
+
|
19
|
+
#if (defined(_DEBUG) || defined(GIT_ASSERT_HARD)) && GIT_ASSERT_HARD != 0
|
20
|
+
# include <assert.h>
|
21
|
+
|
22
|
+
# define GIT_ASSERT(expr) assert(expr)
|
23
|
+
# define GIT_ASSERT_ARG(expr) assert(expr)
|
24
|
+
|
25
|
+
# define GIT_ASSERT_WITH_RETVAL(expr, fail) assert(expr)
|
26
|
+
# define GIT_ASSERT_ARG_WITH_RETVAL(expr, fail) assert(expr)
|
27
|
+
#else
|
28
|
+
|
29
|
+
/** Internal consistency check to stop the function. */
|
30
|
+
# define GIT_ASSERT(expr) GIT_ASSERT_WITH_RETVAL(expr, -1)
|
31
|
+
|
32
|
+
/**
|
33
|
+
* Assert that a consumer-provided argument is valid, setting an
|
34
|
+
* actionable error message and returning -1 if it is not.
|
35
|
+
*/
|
36
|
+
# define GIT_ASSERT_ARG(expr) GIT_ASSERT_ARG_WITH_RETVAL(expr, -1)
|
37
|
+
|
38
|
+
/** Internal consistency check to return the `fail` param on failure. */
|
39
|
+
# define GIT_ASSERT_WITH_RETVAL(expr, fail) \
|
40
|
+
GIT_ASSERT__WITH_RETVAL(expr, GIT_ERROR_INTERNAL, "unrecoverable internal error", fail)
|
41
|
+
|
42
|
+
/**
|
43
|
+
* Assert that a consumer-provided argument is valid, setting an
|
44
|
+
* actionable error message and returning the `fail` param if not.
|
45
|
+
*/
|
46
|
+
# define GIT_ASSERT_ARG_WITH_RETVAL(expr, fail) \
|
47
|
+
GIT_ASSERT__WITH_RETVAL(expr, GIT_ERROR_INVALID, "invalid argument", fail)
|
48
|
+
|
49
|
+
# define GIT_ASSERT__WITH_RETVAL(expr, code, msg, fail) do { \
|
50
|
+
if (!(expr)) { \
|
51
|
+
git_error_set(code, "%s: '%s'", msg, #expr); \
|
52
|
+
return fail; \
|
53
|
+
} \
|
54
|
+
} while(0)
|
55
|
+
|
56
|
+
#endif /* GIT_ASSERT_HARD */
|
57
|
+
|
58
|
+
#endif
|
data/vendor/libgit2/src/attr.c
CHANGED
@@ -19,18 +19,18 @@ const char *git_attr__true = "[internal]__TRUE__";
|
|
19
19
|
const char *git_attr__false = "[internal]__FALSE__";
|
20
20
|
const char *git_attr__unset = "[internal]__UNSET__";
|
21
21
|
|
22
|
-
|
22
|
+
git_attr_value_t git_attr_value(const char *attr)
|
23
23
|
{
|
24
24
|
if (attr == NULL || attr == git_attr__unset)
|
25
|
-
return
|
25
|
+
return GIT_ATTR_VALUE_UNSPECIFIED;
|
26
26
|
|
27
27
|
if (attr == git_attr__true)
|
28
|
-
return
|
28
|
+
return GIT_ATTR_VALUE_TRUE;
|
29
29
|
|
30
30
|
if (attr == git_attr__false)
|
31
|
-
return
|
31
|
+
return GIT_ATTR_VALUE_FALSE;
|
32
32
|
|
33
|
-
return
|
33
|
+
return GIT_ATTR_VALUE_STRING;
|
34
34
|
}
|
35
35
|
|
36
36
|
static int collect_attr_files(
|
@@ -215,7 +215,7 @@ int git_attr_foreach(
|
|
215
215
|
return -1;
|
216
216
|
|
217
217
|
if ((error = collect_attr_files(repo, NULL, flags, pathname, &files)) < 0 ||
|
218
|
-
|
218
|
+
(error = git_strmap_new(&seen)) < 0)
|
219
219
|
goto cleanup;
|
220
220
|
|
221
221
|
git_vector_foreach(&files, i, file) {
|
@@ -227,8 +227,7 @@ int git_attr_foreach(
|
|
227
227
|
if (git_strmap_exists(seen, assign->name))
|
228
228
|
continue;
|
229
229
|
|
230
|
-
|
231
|
-
if (error < 0)
|
230
|
+
if ((error = git_strmap_set(seen, assign->name, assign)) < 0)
|
232
231
|
goto cleanup;
|
233
232
|
|
234
233
|
error = callback(assign->name, assign->value, payload);
|
@@ -253,15 +252,16 @@ static int preload_attr_file(
|
|
253
252
|
git_attr_session *attr_session,
|
254
253
|
git_attr_file_source source,
|
255
254
|
const char *base,
|
256
|
-
const char *file
|
255
|
+
const char *file,
|
256
|
+
bool allow_macros)
|
257
257
|
{
|
258
258
|
int error;
|
259
259
|
git_attr_file *preload = NULL;
|
260
260
|
|
261
261
|
if (!file)
|
262
262
|
return 0;
|
263
|
-
if (!(error = git_attr_cache__get(
|
264
|
-
|
263
|
+
if (!(error = git_attr_cache__get(&preload, repo, attr_session, source, base, file,
|
264
|
+
git_attr_file__parse_buffer, allow_macros)))
|
265
265
|
git_attr_file__free(preload);
|
266
266
|
|
267
267
|
return error;
|
@@ -305,12 +305,15 @@ static int system_attr_file(
|
|
305
305
|
return 0;
|
306
306
|
}
|
307
307
|
|
308
|
-
static int attr_setup(
|
308
|
+
static int attr_setup(
|
309
|
+
git_repository *repo,
|
310
|
+
git_attr_session *attr_session,
|
311
|
+
uint32_t flags)
|
309
312
|
{
|
310
|
-
int error = 0;
|
311
|
-
const char *workdir = git_repository_workdir(repo);
|
312
|
-
git_index *idx = NULL;
|
313
313
|
git_buf path = GIT_BUF_INIT;
|
314
|
+
git_index *idx = NULL;
|
315
|
+
const char *workdir;
|
316
|
+
int error = 0;
|
314
317
|
|
315
318
|
if (attr_session && attr_session->init_setup)
|
316
319
|
return 0;
|
@@ -318,41 +321,43 @@ static int attr_setup(git_repository *repo, git_attr_session *attr_session)
|
|
318
321
|
if ((error = git_attr_cache__init(repo)) < 0)
|
319
322
|
return error;
|
320
323
|
|
321
|
-
/*
|
322
|
-
*
|
324
|
+
/*
|
325
|
+
* Preload attribute files that could contain macros so the
|
326
|
+
* definitions will be available for later file parsing.
|
323
327
|
*/
|
324
328
|
|
325
|
-
error = system_attr_file(&path, attr_session)
|
326
|
-
|
327
|
-
|
328
|
-
error
|
329
|
-
|
330
|
-
|
331
|
-
if (error != GIT_ENOTFOUND)
|
332
|
-
goto out;
|
333
|
-
|
334
|
-
if ((error = preload_attr_file(
|
335
|
-
repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
336
|
-
NULL, git_repository_attr_cache(repo)->cfg_attr_file)) < 0)
|
337
|
-
goto out;
|
329
|
+
if ((error = system_attr_file(&path, attr_session)) < 0 ||
|
330
|
+
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
331
|
+
NULL, path.ptr, true)) < 0) {
|
332
|
+
if (error != GIT_ENOTFOUND)
|
333
|
+
goto out;
|
334
|
+
}
|
338
335
|
|
339
|
-
if ((error =
|
340
|
-
|
336
|
+
if ((error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
337
|
+
NULL, git_repository_attr_cache(repo)->cfg_attr_file, true)) < 0)
|
341
338
|
goto out;
|
342
339
|
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
340
|
+
git_buf_clear(&path); /* git_repository_item_path expects an empty buffer, because it uses git_buf_set */
|
341
|
+
if ((error = git_repository_item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
|
342
|
+
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
343
|
+
path.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
|
344
|
+
if (error != GIT_ENOTFOUND)
|
345
|
+
goto out;
|
346
|
+
}
|
347
347
|
|
348
|
-
if (workdir != NULL &&
|
349
|
-
|
350
|
-
|
351
|
-
|
348
|
+
if ((workdir = git_repository_workdir(repo)) != NULL &&
|
349
|
+
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
|
350
|
+
workdir, GIT_ATTR_FILE, true)) < 0)
|
351
|
+
goto out;
|
352
352
|
|
353
353
|
if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
|
354
|
-
|
355
|
-
|
354
|
+
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_INDEX,
|
355
|
+
NULL, GIT_ATTR_FILE, true)) < 0)
|
356
|
+
goto out;
|
357
|
+
|
358
|
+
if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0 &&
|
359
|
+
(error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_HEAD,
|
360
|
+
NULL, GIT_ATTR_FILE, true)) < 0)
|
356
361
|
goto out;
|
357
362
|
|
358
363
|
if (attr_session)
|
@@ -431,6 +436,9 @@ static int attr_decide_sources(
|
|
431
436
|
break;
|
432
437
|
}
|
433
438
|
|
439
|
+
if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0)
|
440
|
+
srcs[count++] = GIT_ATTR_FILE__FROM_HEAD;
|
441
|
+
|
434
442
|
return count;
|
435
443
|
}
|
436
444
|
|
@@ -440,13 +448,14 @@ static int push_attr_file(
|
|
440
448
|
git_vector *list,
|
441
449
|
git_attr_file_source source,
|
442
450
|
const char *base,
|
443
|
-
const char *filename
|
451
|
+
const char *filename,
|
452
|
+
bool allow_macros)
|
444
453
|
{
|
445
454
|
int error = 0;
|
446
455
|
git_attr_file *file = NULL;
|
447
456
|
|
448
457
|
error = git_attr_cache__get(&file, repo, attr_session,
|
449
|
-
source, base, filename, git_attr_file__parse_buffer);
|
458
|
+
source, base, filename, git_attr_file__parse_buffer, allow_macros);
|
450
459
|
|
451
460
|
if (error < 0)
|
452
461
|
return error;
|
@@ -461,16 +470,18 @@ static int push_attr_file(
|
|
461
470
|
|
462
471
|
static int push_one_attr(void *ref, const char *path)
|
463
472
|
{
|
464
|
-
int error = 0, n_src, i;
|
465
473
|
attr_walk_up_info *info = (attr_walk_up_info *)ref;
|
466
|
-
git_attr_file_source src[
|
474
|
+
git_attr_file_source src[GIT_ATTR_FILE_NUM_SOURCES];
|
475
|
+
int error = 0, n_src, i;
|
476
|
+
bool allow_macros;
|
467
477
|
|
468
478
|
n_src = attr_decide_sources(
|
469
479
|
info->flags, info->workdir != NULL, info->index != NULL, src);
|
480
|
+
allow_macros = info->workdir ? !strcmp(info->workdir, path) : false;
|
470
481
|
|
471
482
|
for (i = 0; !error && i < n_src; ++i)
|
472
|
-
error = push_attr_file(info->repo, info->attr_session,
|
473
|
-
|
483
|
+
error = push_attr_file(info->repo, info->attr_session, info->files,
|
484
|
+
src[i], path, GIT_ATTR_FILE, allow_macros);
|
474
485
|
|
475
486
|
return error;
|
476
487
|
}
|
@@ -499,7 +510,7 @@ static int collect_attr_files(
|
|
499
510
|
const char *workdir = git_repository_workdir(repo);
|
500
511
|
attr_walk_up_info info = { NULL };
|
501
512
|
|
502
|
-
if ((error = attr_setup(repo, attr_session)) < 0)
|
513
|
+
if ((error = attr_setup(repo, attr_session, flags)) < 0)
|
503
514
|
return error;
|
504
515
|
|
505
516
|
/* Resolve path in a non-bare repo */
|
@@ -517,15 +528,12 @@ static int collect_attr_files(
|
|
517
528
|
* - $GIT_PREFIX/etc/gitattributes
|
518
529
|
*/
|
519
530
|
|
520
|
-
error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO)
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
attrfile.ptr, GIT_ATTR_FILE_INREPO);
|
527
|
-
if (error < 0)
|
528
|
-
goto cleanup;
|
531
|
+
if ((error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
|
532
|
+
(error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
|
533
|
+
attrfile.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
|
534
|
+
if (error != GIT_ENOTFOUND)
|
535
|
+
goto cleanup;
|
536
|
+
}
|
529
537
|
|
530
538
|
info.repo = repo;
|
531
539
|
info.attr_session = attr_session;
|
@@ -544,9 +552,8 @@ static int collect_attr_files(
|
|
544
552
|
goto cleanup;
|
545
553
|
|
546
554
|
if (git_repository_attr_cache(repo)->cfg_attr_file != NULL) {
|
547
|
-
error = push_attr_file(
|
548
|
-
|
549
|
-
NULL, git_repository_attr_cache(repo)->cfg_attr_file);
|
555
|
+
error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
|
556
|
+
NULL, git_repository_attr_cache(repo)->cfg_attr_file, true);
|
550
557
|
if (error < 0)
|
551
558
|
goto cleanup;
|
552
559
|
}
|
@@ -555,9 +562,8 @@ static int collect_attr_files(
|
|
555
562
|
error = system_attr_file(&dir, attr_session);
|
556
563
|
|
557
564
|
if (!error)
|
558
|
-
error = push_attr_file(
|
559
|
-
|
560
|
-
NULL, dir.ptr);
|
565
|
+
error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
|
566
|
+
NULL, dir.ptr, true);
|
561
567
|
else if (error == GIT_ENOTFOUND)
|
562
568
|
error = 0;
|
563
569
|
}
|