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/config.h
CHANGED
@@ -66,18 +66,19 @@ extern int git_config__get_bool_force(
|
|
66
66
|
extern int git_config__get_int_force(
|
67
67
|
const git_config *cfg, const char *key, int fallback_value);
|
68
68
|
|
69
|
-
/* API for repository
|
70
|
-
* uses
|
69
|
+
/* API for repository configmap-style lookups from config - not cached, but
|
70
|
+
* uses configmap value maps and fallbacks
|
71
71
|
*/
|
72
|
-
extern int
|
73
|
-
int *out, git_config *config,
|
72
|
+
extern int git_config__configmap_lookup(
|
73
|
+
int *out, git_config *config, git_configmap_item item);
|
74
74
|
|
75
75
|
/**
|
76
76
|
* The opposite of git_config_lookup_map_value, we take an enum value
|
77
77
|
* and map it to the string or bool value on the config.
|
78
78
|
*/
|
79
|
-
int git_config_lookup_map_enum(
|
80
|
-
|
79
|
+
int git_config_lookup_map_enum(git_configmap_t *type_out,
|
80
|
+
const char **str_out, const git_configmap *maps,
|
81
|
+
size_t map_n, int enum_val);
|
81
82
|
|
82
83
|
/**
|
83
84
|
* Unlock the backend with the highest priority
|
@@ -25,6 +25,18 @@
|
|
25
25
|
*/
|
26
26
|
extern int git_config_backend_from_file(git_config_backend **out, const char *path);
|
27
27
|
|
28
|
+
/**
|
29
|
+
* Create a readonly configuration file backend from another backend
|
30
|
+
*
|
31
|
+
* This copies the complete contents of the source backend to the
|
32
|
+
* new backend. The new backend will be completely read-only and
|
33
|
+
* cannot be modified.
|
34
|
+
*
|
35
|
+
* @param out the new snapshotted backend
|
36
|
+
* @param source the backend to copy
|
37
|
+
*/
|
38
|
+
extern int git_config_backend_snapshot(git_config_backend **out, git_config_backend *source);
|
39
|
+
|
28
40
|
/**
|
29
41
|
* Create an in-memory configuration file backend
|
30
42
|
*
|
@@ -7,7 +7,7 @@
|
|
7
7
|
|
8
8
|
#include "common.h"
|
9
9
|
|
10
|
-
#include "
|
10
|
+
#include "futils.h"
|
11
11
|
#include "repository.h"
|
12
12
|
#include "config.h"
|
13
13
|
#include "git2/config.h"
|
@@ -15,8 +15,8 @@
|
|
15
15
|
#include "filter.h"
|
16
16
|
|
17
17
|
struct map_data {
|
18
|
-
const char *
|
19
|
-
|
18
|
+
const char *name;
|
19
|
+
git_configmap *maps;
|
20
20
|
size_t map_count;
|
21
21
|
int default_value;
|
22
22
|
};
|
@@ -29,11 +29,11 @@ struct map_data {
|
|
29
29
|
* value is native. See gitattributes(5) for more information on
|
30
30
|
* end-of-line conversion.
|
31
31
|
*/
|
32
|
-
static
|
33
|
-
{
|
34
|
-
{
|
35
|
-
{
|
36
|
-
{
|
32
|
+
static git_configmap _configmap_eol[] = {
|
33
|
+
{GIT_CONFIGMAP_FALSE, NULL, GIT_EOL_UNSET},
|
34
|
+
{GIT_CONFIGMAP_STRING, "lf", GIT_EOL_LF},
|
35
|
+
{GIT_CONFIGMAP_STRING, "crlf", GIT_EOL_CRLF},
|
36
|
+
{GIT_CONFIGMAP_STRING, "native", GIT_EOL_NATIVE}
|
37
37
|
};
|
38
38
|
|
39
39
|
/*
|
@@ -46,55 +46,55 @@ static git_cvar_map _cvar_map_eol[] = {
|
|
46
46
|
* does not have normalized line endings. This variable can be set to input,
|
47
47
|
* in which case no output conversion is performed.
|
48
48
|
*/
|
49
|
-
static
|
50
|
-
{
|
51
|
-
{
|
52
|
-
{
|
49
|
+
static git_configmap _configmap_autocrlf[] = {
|
50
|
+
{GIT_CONFIGMAP_FALSE, NULL, GIT_AUTO_CRLF_FALSE},
|
51
|
+
{GIT_CONFIGMAP_TRUE, NULL, GIT_AUTO_CRLF_TRUE},
|
52
|
+
{GIT_CONFIGMAP_STRING, "input", GIT_AUTO_CRLF_INPUT}
|
53
53
|
};
|
54
54
|
|
55
|
-
static
|
56
|
-
{
|
57
|
-
{
|
58
|
-
{
|
55
|
+
static git_configmap _configmap_safecrlf[] = {
|
56
|
+
{GIT_CONFIGMAP_FALSE, NULL, GIT_SAFE_CRLF_FALSE},
|
57
|
+
{GIT_CONFIGMAP_TRUE, NULL, GIT_SAFE_CRLF_FAIL},
|
58
|
+
{GIT_CONFIGMAP_STRING, "warn", GIT_SAFE_CRLF_WARN}
|
59
59
|
};
|
60
60
|
|
61
|
-
static
|
62
|
-
{
|
63
|
-
{
|
64
|
-
{
|
61
|
+
static git_configmap _configmap_logallrefupdates[] = {
|
62
|
+
{GIT_CONFIGMAP_FALSE, NULL, GIT_LOGALLREFUPDATES_FALSE},
|
63
|
+
{GIT_CONFIGMAP_TRUE, NULL, GIT_LOGALLREFUPDATES_TRUE},
|
64
|
+
{GIT_CONFIGMAP_STRING, "always", GIT_LOGALLREFUPDATES_ALWAYS},
|
65
65
|
};
|
66
66
|
|
67
67
|
/*
|
68
68
|
* Generic map for integer values
|
69
69
|
*/
|
70
|
-
static
|
71
|
-
{
|
70
|
+
static git_configmap _configmap_int[] = {
|
71
|
+
{GIT_CONFIGMAP_INT32, NULL, 0},
|
72
72
|
};
|
73
73
|
|
74
|
-
static struct map_data
|
75
|
-
{"core.autocrlf",
|
76
|
-
{"core.eol",
|
74
|
+
static struct map_data _configmaps[] = {
|
75
|
+
{"core.autocrlf", _configmap_autocrlf, ARRAY_SIZE(_configmap_autocrlf), GIT_AUTO_CRLF_DEFAULT},
|
76
|
+
{"core.eol", _configmap_eol, ARRAY_SIZE(_configmap_eol), GIT_EOL_DEFAULT},
|
77
77
|
{"core.symlinks", NULL, 0, GIT_SYMLINKS_DEFAULT },
|
78
78
|
{"core.ignorecase", NULL, 0, GIT_IGNORECASE_DEFAULT },
|
79
79
|
{"core.filemode", NULL, 0, GIT_FILEMODE_DEFAULT },
|
80
80
|
{"core.ignorestat", NULL, 0, GIT_IGNORESTAT_DEFAULT },
|
81
81
|
{"core.trustctime", NULL, 0, GIT_TRUSTCTIME_DEFAULT },
|
82
|
-
{"core.abbrev",
|
82
|
+
{"core.abbrev", _configmap_int, 1, GIT_ABBREV_DEFAULT },
|
83
83
|
{"core.precomposeunicode", NULL, 0, GIT_PRECOMPOSE_DEFAULT },
|
84
|
-
{"core.safecrlf",
|
85
|
-
{"core.logallrefupdates",
|
84
|
+
{"core.safecrlf", _configmap_safecrlf, ARRAY_SIZE(_configmap_safecrlf), GIT_SAFE_CRLF_DEFAULT},
|
85
|
+
{"core.logallrefupdates", _configmap_logallrefupdates, ARRAY_SIZE(_configmap_logallrefupdates), GIT_LOGALLREFUPDATES_DEFAULT},
|
86
86
|
{"core.protecthfs", NULL, 0, GIT_PROTECTHFS_DEFAULT },
|
87
87
|
{"core.protectntfs", NULL, 0, GIT_PROTECTNTFS_DEFAULT },
|
88
88
|
{"core.fsyncobjectfiles", NULL, 0, GIT_FSYNCOBJECTFILES_DEFAULT },
|
89
89
|
};
|
90
90
|
|
91
|
-
int
|
91
|
+
int git_config__configmap_lookup(int *out, git_config *config, git_configmap_item item)
|
92
92
|
{
|
93
93
|
int error = 0;
|
94
|
-
struct map_data *data = &
|
94
|
+
struct map_data *data = &_configmaps[(int)item];
|
95
95
|
git_config_entry *entry;
|
96
96
|
|
97
|
-
if ((error = git_config__lookup_entry(&entry, config, data->
|
97
|
+
if ((error = git_config__lookup_entry(&entry, config, data->name, false)) < 0)
|
98
98
|
return error;
|
99
99
|
|
100
100
|
if (!entry)
|
@@ -109,29 +109,32 @@ int git_config__cvar(int *out, git_config *config, git_cvar_cached cvar)
|
|
109
109
|
return error;
|
110
110
|
}
|
111
111
|
|
112
|
-
int
|
112
|
+
int git_repository__configmap_lookup(int *out, git_repository *repo, git_configmap_item item)
|
113
113
|
{
|
114
|
-
|
114
|
+
intptr_t value = repo->configmap_cache[(int)item];
|
115
115
|
|
116
|
-
|
116
|
+
*out = (int)value;
|
117
|
+
|
118
|
+
if (value == GIT_CONFIGMAP_NOT_CACHED) {
|
117
119
|
int error;
|
118
120
|
git_config *config;
|
119
121
|
|
120
122
|
if ((error = git_repository_config__weakptr(&config, repo)) < 0 ||
|
121
|
-
(error =
|
123
|
+
(error = git_config__configmap_lookup(out, config, item)) < 0)
|
122
124
|
return error;
|
123
125
|
|
124
|
-
|
126
|
+
value = *out;
|
127
|
+
repo->configmap_cache[(int)item] = value;
|
125
128
|
}
|
126
129
|
|
127
130
|
return 0;
|
128
131
|
}
|
129
132
|
|
130
|
-
void
|
133
|
+
void git_repository__configmap_lookup_cache_clear(git_repository *repo)
|
131
134
|
{
|
132
135
|
int i;
|
133
136
|
|
134
|
-
for (i = 0; i <
|
135
|
-
repo->
|
137
|
+
for (i = 0; i < GIT_CONFIGMAP_CACHE_MAX; ++i)
|
138
|
+
repo->configmap_cache[i] = GIT_CONFIGMAP_NOT_CACHED;
|
136
139
|
}
|
137
140
|
|
@@ -13,6 +13,11 @@ typedef struct config_entry_list {
|
|
13
13
|
git_config_entry *entry;
|
14
14
|
} config_entry_list;
|
15
15
|
|
16
|
+
typedef struct {
|
17
|
+
git_config_entry *entry;
|
18
|
+
bool multivar;
|
19
|
+
} config_entry_map_head;
|
20
|
+
|
16
21
|
typedef struct config_entries_iterator {
|
17
22
|
git_config_iterator parent;
|
18
23
|
git_config_entries *entries;
|
@@ -25,31 +30,6 @@ struct git_config_entries {
|
|
25
30
|
config_entry_list *list;
|
26
31
|
};
|
27
32
|
|
28
|
-
static void config_entry_list_free(config_entry_list *list)
|
29
|
-
{
|
30
|
-
config_entry_list *next;
|
31
|
-
|
32
|
-
while (list != NULL) {
|
33
|
-
next = list->next;
|
34
|
-
|
35
|
-
git__free((char*) list->entry->name);
|
36
|
-
git__free((char *) list->entry->value);
|
37
|
-
git__free(list->entry);
|
38
|
-
git__free(list);
|
39
|
-
|
40
|
-
list = next;
|
41
|
-
};
|
42
|
-
}
|
43
|
-
|
44
|
-
static void config_entry_list_append(config_entry_list **list, config_entry_list *entry)
|
45
|
-
{
|
46
|
-
if (*list)
|
47
|
-
(*list)->last->next = entry;
|
48
|
-
else
|
49
|
-
*list = entry;
|
50
|
-
(*list)->last = entry;
|
51
|
-
}
|
52
|
-
|
53
33
|
int git_config_entries_new(git_config_entries **out)
|
54
34
|
{
|
55
35
|
git_config_entries *entries;
|
@@ -59,7 +39,7 @@ int git_config_entries_new(git_config_entries **out)
|
|
59
39
|
GIT_ERROR_CHECK_ALLOC(entries);
|
60
40
|
GIT_REFCOUNT_INC(entries);
|
61
41
|
|
62
|
-
if ((error =
|
42
|
+
if ((error = git_strmap_new(&entries->map)) < 0)
|
63
43
|
git__free(entries);
|
64
44
|
else
|
65
45
|
*out = entries;
|
@@ -67,6 +47,36 @@ int git_config_entries_new(git_config_entries **out)
|
|
67
47
|
return error;
|
68
48
|
}
|
69
49
|
|
50
|
+
int git_config_entries_dup_entry(git_config_entries *entries, const git_config_entry *entry)
|
51
|
+
{
|
52
|
+
git_config_entry *duplicated;
|
53
|
+
int error;
|
54
|
+
|
55
|
+
duplicated = git__calloc(1, sizeof(git_config_entry));
|
56
|
+
GIT_ERROR_CHECK_ALLOC(duplicated);
|
57
|
+
|
58
|
+
duplicated->name = git__strdup(entry->name);
|
59
|
+
GIT_ERROR_CHECK_ALLOC(duplicated->name);
|
60
|
+
|
61
|
+
if (entry->value) {
|
62
|
+
duplicated->value = git__strdup(entry->value);
|
63
|
+
GIT_ERROR_CHECK_ALLOC(duplicated->value);
|
64
|
+
}
|
65
|
+
duplicated->level = entry->level;
|
66
|
+
duplicated->include_depth = entry->include_depth;
|
67
|
+
|
68
|
+
if ((error = git_config_entries_append(entries, duplicated)) < 0)
|
69
|
+
goto out;
|
70
|
+
|
71
|
+
out:
|
72
|
+
if (error && duplicated) {
|
73
|
+
git__free((char *) duplicated->name);
|
74
|
+
git__free((char *) duplicated->value);
|
75
|
+
git__free(duplicated);
|
76
|
+
}
|
77
|
+
return error;
|
78
|
+
}
|
79
|
+
|
70
80
|
int git_config_entries_dup(git_config_entries **out, git_config_entries *entries)
|
71
81
|
{
|
72
82
|
git_config_entries *result = NULL;
|
@@ -76,22 +86,9 @@ int git_config_entries_dup(git_config_entries **out, git_config_entries *entries
|
|
76
86
|
if ((error = git_config_entries_new(&result)) < 0)
|
77
87
|
goto out;
|
78
88
|
|
79
|
-
for (head = entries->list; head; head = head->next)
|
80
|
-
|
81
|
-
|
82
|
-
dup = git__calloc(1, sizeof(git_config_entry));
|
83
|
-
dup->name = git__strdup(head->entry->name);
|
84
|
-
GIT_ERROR_CHECK_ALLOC(dup->name);
|
85
|
-
if (head->entry->value) {
|
86
|
-
dup->value = git__strdup(head->entry->value);
|
87
|
-
GIT_ERROR_CHECK_ALLOC(dup->value);
|
88
|
-
}
|
89
|
-
dup->level = head->entry->level;
|
90
|
-
dup->include_depth = head->entry->include_depth;
|
91
|
-
|
92
|
-
if ((error = git_config_entries_append(result, dup)) < 0)
|
89
|
+
for (head = entries->list; head; head = head->next)
|
90
|
+
if ((git_config_entries_dup_entry(result, head->entry)) < 0)
|
93
91
|
goto out;
|
94
|
-
}
|
95
92
|
|
96
93
|
*out = result;
|
97
94
|
result = NULL;
|
@@ -109,13 +106,18 @@ void git_config_entries_incref(git_config_entries *entries)
|
|
109
106
|
static void config_entries_free(git_config_entries *entries)
|
110
107
|
{
|
111
108
|
config_entry_list *list = NULL, *next;
|
109
|
+
config_entry_map_head *head;
|
112
110
|
|
113
|
-
git_strmap_foreach_value(entries->map,
|
111
|
+
git_strmap_foreach_value(entries->map, head,
|
112
|
+
git__free((char *) head->entry->name); git__free(head)
|
113
|
+
);
|
114
114
|
git_strmap_free(entries->map);
|
115
115
|
|
116
116
|
list = entries->list;
|
117
117
|
while (list != NULL) {
|
118
118
|
next = list->next;
|
119
|
+
git__free((char *) list->entry->value);
|
120
|
+
git__free(list->entry);
|
119
121
|
git__free(list);
|
120
122
|
list = next;
|
121
123
|
}
|
@@ -131,80 +133,56 @@ void git_config_entries_free(git_config_entries *entries)
|
|
131
133
|
|
132
134
|
int git_config_entries_append(git_config_entries *entries, git_config_entry *entry)
|
133
135
|
{
|
134
|
-
config_entry_list *
|
135
|
-
|
136
|
-
size_t pos;
|
136
|
+
config_entry_list *list_head;
|
137
|
+
config_entry_map_head *map_head;
|
137
138
|
|
138
|
-
|
139
|
-
|
140
|
-
var->entry = entry;
|
141
|
-
|
142
|
-
pos = git_strmap_lookup_index(entries->map, entry->name);
|
143
|
-
if (!git_strmap_valid_index(entries->map, pos)) {
|
139
|
+
if ((map_head = git_strmap_get(entries->map, entry->name)) != NULL) {
|
140
|
+
map_head->multivar = true;
|
144
141
|
/*
|
145
|
-
*
|
146
|
-
*
|
147
|
-
*
|
148
|
-
*
|
149
|
-
* why we set `last` here to itself. Otherwise we
|
150
|
-
* do not have to set `last` and leave it set to
|
151
|
-
* `NULL`.
|
142
|
+
* This is a micro-optimization for configuration files
|
143
|
+
* with a lot of same keys. As for multivars the entry's
|
144
|
+
* key will be the same for all entries, we can just free
|
145
|
+
* all except the first entry's name and just re-use it.
|
152
146
|
*/
|
153
|
-
|
154
|
-
|
155
|
-
git_strmap_insert(entries->map, entry->name, var, &error);
|
156
|
-
|
157
|
-
if (error > 0)
|
158
|
-
error = 0;
|
147
|
+
git__free((char *) entry->name);
|
148
|
+
entry->name = map_head->entry->name;
|
159
149
|
} else {
|
160
|
-
|
161
|
-
|
150
|
+
map_head = git__calloc(1, sizeof(*map_head));
|
151
|
+
if ((git_strmap_set(entries->map, entry->name, map_head)) < 0)
|
152
|
+
return -1;
|
162
153
|
}
|
154
|
+
map_head->entry = entry;
|
163
155
|
|
164
|
-
|
165
|
-
GIT_ERROR_CHECK_ALLOC(
|
166
|
-
|
167
|
-
config_entry_list_append(&entries->list, var);
|
168
|
-
|
169
|
-
return error;
|
170
|
-
}
|
171
|
-
|
172
|
-
int config_entry_get(config_entry_list **out, git_config_entries *entries, const char *key)
|
173
|
-
{
|
174
|
-
size_t pos;
|
175
|
-
|
176
|
-
pos = git_strmap_lookup_index(entries->map, key);
|
156
|
+
list_head = git__calloc(1, sizeof(config_entry_list));
|
157
|
+
GIT_ERROR_CHECK_ALLOC(list_head);
|
158
|
+
list_head->entry = entry;
|
177
159
|
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
160
|
+
if (entries->list)
|
161
|
+
entries->list->last->next = list_head;
|
162
|
+
else
|
163
|
+
entries->list = list_head;
|
164
|
+
entries->list->last = list_head;
|
183
165
|
|
184
166
|
return 0;
|
185
167
|
}
|
186
168
|
|
187
169
|
int git_config_entries_get(git_config_entry **out, git_config_entries *entries, const char *key)
|
188
170
|
{
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
return error;
|
194
|
-
*out = entry->last->entry;
|
195
|
-
|
171
|
+
config_entry_map_head *entry;
|
172
|
+
if ((entry = git_strmap_get(entries->map, key)) == NULL)
|
173
|
+
return GIT_ENOTFOUND;
|
174
|
+
*out = entry->entry;
|
196
175
|
return 0;
|
197
176
|
}
|
198
177
|
|
199
178
|
int git_config_entries_get_unique(git_config_entry **out, git_config_entries *entries, const char *key)
|
200
179
|
{
|
201
|
-
|
202
|
-
int error;
|
180
|
+
config_entry_map_head *entry;
|
203
181
|
|
204
|
-
if ((
|
205
|
-
return
|
182
|
+
if ((entry = git_strmap_get(entries->map, key)) == NULL)
|
183
|
+
return GIT_ENOTFOUND;
|
206
184
|
|
207
|
-
if (entry->
|
185
|
+
if (entry->multivar) {
|
208
186
|
git_error_set(GIT_ERROR_CONFIG, "entry is not unique due to being a multivar");
|
209
187
|
return -1;
|
210
188
|
}
|
@@ -219,14 +197,14 @@ int git_config_entries_get_unique(git_config_entry **out, git_config_entries *en
|
|
219
197
|
return 0;
|
220
198
|
}
|
221
199
|
|
222
|
-
void config_iterator_free(git_config_iterator *iter)
|
200
|
+
static void config_iterator_free(git_config_iterator *iter)
|
223
201
|
{
|
224
202
|
config_entries_iterator *it = (config_entries_iterator *) iter;
|
225
203
|
git_config_entries_free(it->entries);
|
226
204
|
git__free(it);
|
227
205
|
}
|
228
206
|
|
229
|
-
int config_iterator_next(
|
207
|
+
static int config_iterator_next(
|
230
208
|
git_config_entry **entry,
|
231
209
|
git_config_iterator *iter)
|
232
210
|
{
|