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/reflog.c
CHANGED
@@ -12,12 +12,8 @@
|
|
12
12
|
#include "signature.h"
|
13
13
|
#include "refdb.h"
|
14
14
|
|
15
|
-
#include
|
16
|
-
|
17
|
-
git_reflog_entry *git_reflog_entry__alloc(void)
|
18
|
-
{
|
19
|
-
return git__calloc(1, sizeof(git_reflog_entry));
|
20
|
-
}
|
15
|
+
#include "git2/sys/refdb_backend.h"
|
16
|
+
#include "git2/sys/reflog.h"
|
21
17
|
|
22
18
|
void git_reflog_entry__free(git_reflog_entry *entry)
|
23
19
|
{
|
@@ -74,9 +70,8 @@ int git_reflog_write(git_reflog *reflog)
|
|
74
70
|
|
75
71
|
int git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_signature *committer, const char *msg)
|
76
72
|
{
|
77
|
-
git_reflog_entry *entry;
|
78
73
|
const git_reflog_entry *previous;
|
79
|
-
|
74
|
+
git_reflog_entry *entry;
|
80
75
|
|
81
76
|
assert(reflog && new_oid && committer);
|
82
77
|
|
@@ -87,19 +82,18 @@ int git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_sign
|
|
87
82
|
goto cleanup;
|
88
83
|
|
89
84
|
if (msg != NULL) {
|
90
|
-
|
91
|
-
goto cleanup;
|
85
|
+
size_t i, msglen = strlen(msg);
|
92
86
|
|
93
|
-
|
94
|
-
|
95
|
-
if (newline) {
|
96
|
-
if (newline[1] != '\0') {
|
97
|
-
git_error_set(GIT_ERROR_INVALID, "reflog message cannot contain newline");
|
98
|
-
goto cleanup;
|
99
|
-
}
|
87
|
+
if ((entry->msg = git__strndup(msg, msglen)) == NULL)
|
88
|
+
goto cleanup;
|
100
89
|
|
101
|
-
|
102
|
-
|
90
|
+
/*
|
91
|
+
* Replace all newlines with spaces, except for
|
92
|
+
* the final trailing newline.
|
93
|
+
*/
|
94
|
+
for (i = 0; i < msglen; i++)
|
95
|
+
if (entry->msg[i] == '\n')
|
96
|
+
entry->msg[i] = ' ';
|
103
97
|
}
|
104
98
|
|
105
99
|
previous = git_reflog_entry_byindex(reflog, 0);
|
data/vendor/libgit2/src/refs.c
CHANGED
@@ -9,7 +9,7 @@
|
|
9
9
|
|
10
10
|
#include "hash.h"
|
11
11
|
#include "repository.h"
|
12
|
-
#include "
|
12
|
+
#include "futils.h"
|
13
13
|
#include "filebuf.h"
|
14
14
|
#include "pack.h"
|
15
15
|
#include "reflog.h"
|
@@ -27,9 +27,6 @@
|
|
27
27
|
|
28
28
|
bool git_reference__enable_symbolic_ref_target_validation = true;
|
29
29
|
|
30
|
-
#define DEFAULT_NESTING_LEVEL 5
|
31
|
-
#define MAX_NESTING_LEVEL 10
|
32
|
-
|
33
30
|
enum {
|
34
31
|
GIT_PACKREF_HAS_PEEL = 1,
|
35
32
|
GIT_PACKREF_WAS_LOOSE = 2
|
@@ -91,18 +88,23 @@ git_reference *git_reference__alloc(
|
|
91
88
|
return ref;
|
92
89
|
}
|
93
90
|
|
94
|
-
git_reference *
|
95
|
-
git_reference
|
91
|
+
git_reference *git_reference__realloc(
|
92
|
+
git_reference **ptr_to_ref, const char *name)
|
96
93
|
{
|
97
|
-
size_t namelen
|
98
|
-
size_t reflen;
|
94
|
+
size_t namelen, reflen;
|
99
95
|
git_reference *rewrite = NULL;
|
100
96
|
|
97
|
+
assert(ptr_to_ref && name);
|
98
|
+
|
99
|
+
namelen = strlen(name);
|
100
|
+
|
101
101
|
if (!GIT_ADD_SIZET_OVERFLOW(&reflen, sizeof(git_reference), namelen) &&
|
102
102
|
!GIT_ADD_SIZET_OVERFLOW(&reflen, reflen, 1) &&
|
103
|
-
(rewrite = git__realloc(
|
103
|
+
(rewrite = git__realloc(*ptr_to_ref, reflen)) != NULL)
|
104
104
|
memcpy(rewrite->name, name, namelen + 1);
|
105
105
|
|
106
|
+
*ptr_to_ref = NULL;
|
107
|
+
|
106
108
|
return rewrite;
|
107
109
|
}
|
108
110
|
|
@@ -193,7 +195,7 @@ static int reference_normalize_for_repo(
|
|
193
195
|
int precompose;
|
194
196
|
unsigned int flags = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL;
|
195
197
|
|
196
|
-
if (!
|
198
|
+
if (!git_repository__configmap_lookup(&precompose, repo, GIT_CONFIGMAP_PRECOMPOSE) &&
|
197
199
|
precompose)
|
198
200
|
flags |= GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE;
|
199
201
|
|
@@ -209,89 +211,32 @@ int git_reference_lookup_resolved(
|
|
209
211
|
const char *name,
|
210
212
|
int max_nesting)
|
211
213
|
{
|
212
|
-
git_refname_t
|
213
|
-
git_reference_t scan_type;
|
214
|
-
int error = 0, nesting;
|
215
|
-
git_reference *ref = NULL;
|
214
|
+
git_refname_t normalized;
|
216
215
|
git_refdb *refdb;
|
216
|
+
int error = 0;
|
217
217
|
|
218
218
|
assert(ref_out && repo && name);
|
219
219
|
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
max_nesting = MAX_NESTING_LEVEL;
|
224
|
-
else if (max_nesting < 0)
|
225
|
-
max_nesting = DEFAULT_NESTING_LEVEL;
|
226
|
-
|
227
|
-
scan_type = GIT_REFERENCE_SYMBOLIC;
|
228
|
-
|
229
|
-
if ((error = reference_normalize_for_repo(scan_name, repo, name, true)) < 0)
|
220
|
+
if ((error = reference_normalize_for_repo(normalized, repo, name, true)) < 0 ||
|
221
|
+
(error = git_repository_refdb__weakptr(&refdb, repo)) < 0 ||
|
222
|
+
(error = git_refdb_resolve(ref_out, refdb, normalized, max_nesting)) < 0)
|
230
223
|
return error;
|
231
224
|
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
{
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
}
|
243
|
-
|
244
|
-
if ((error = git_refdb_lookup(&ref, refdb, scan_name)) < 0)
|
245
|
-
return error;
|
246
|
-
|
247
|
-
scan_type = ref->type;
|
248
|
-
}
|
249
|
-
|
250
|
-
if (scan_type != GIT_REFERENCE_DIRECT && max_nesting != 0) {
|
251
|
-
git_error_set(GIT_ERROR_REFERENCE,
|
252
|
-
"cannot resolve reference (>%u levels deep)", max_nesting);
|
253
|
-
git_reference_free(ref);
|
254
|
-
return -1;
|
225
|
+
/*
|
226
|
+
* The resolved reference may be a symbolic reference in case its
|
227
|
+
* target doesn't exist. If the user asked us to resolve (e.g.
|
228
|
+
* `max_nesting != 0`), then we need to return an error in case we got
|
229
|
+
* a symbolic reference back.
|
230
|
+
*/
|
231
|
+
if (max_nesting && git_reference_type(*ref_out) == GIT_REFERENCE_SYMBOLIC) {
|
232
|
+
git_reference_free(*ref_out);
|
233
|
+
*ref_out = NULL;
|
234
|
+
return GIT_ENOTFOUND;
|
255
235
|
}
|
256
236
|
|
257
|
-
*ref_out = ref;
|
258
237
|
return 0;
|
259
238
|
}
|
260
239
|
|
261
|
-
int git_reference__read_head(
|
262
|
-
git_reference **out,
|
263
|
-
git_repository *repo,
|
264
|
-
const char *path)
|
265
|
-
{
|
266
|
-
git_buf reference = GIT_BUF_INIT;
|
267
|
-
char *name = NULL;
|
268
|
-
int error;
|
269
|
-
|
270
|
-
if ((error = git_futils_readbuffer(&reference, path)) < 0)
|
271
|
-
goto out;
|
272
|
-
git_buf_rtrim(&reference);
|
273
|
-
|
274
|
-
if (git__strncmp(reference.ptr, GIT_SYMREF, strlen(GIT_SYMREF)) == 0) {
|
275
|
-
git_buf_consume(&reference, reference.ptr + strlen(GIT_SYMREF));
|
276
|
-
|
277
|
-
name = git_path_basename(path);
|
278
|
-
|
279
|
-
if ((*out = git_reference__alloc_symbolic(name, reference.ptr)) == NULL) {
|
280
|
-
error = -1;
|
281
|
-
goto out;
|
282
|
-
}
|
283
|
-
} else {
|
284
|
-
if ((error = git_reference_lookup(out, repo, reference.ptr)) < 0)
|
285
|
-
goto out;
|
286
|
-
}
|
287
|
-
|
288
|
-
out:
|
289
|
-
git__free(name);
|
290
|
-
git_buf_dispose(&reference);
|
291
|
-
|
292
|
-
return error;
|
293
|
-
}
|
294
|
-
|
295
240
|
int git_reference_dwim(git_reference **out, git_repository *repo, const char *refname)
|
296
241
|
{
|
297
242
|
int error = 0, i;
|
@@ -391,7 +336,7 @@ const git_oid *git_reference_target_peel(const git_reference *ref)
|
|
391
336
|
{
|
392
337
|
assert(ref);
|
393
338
|
|
394
|
-
if (ref->type != GIT_REFERENCE_DIRECT ||
|
339
|
+
if (ref->type != GIT_REFERENCE_DIRECT || git_oid_is_zero(&ref->peel))
|
395
340
|
return NULL;
|
396
341
|
|
397
342
|
return &ref->peel;
|
@@ -475,7 +420,7 @@ static int reference__create(
|
|
475
420
|
return 0;
|
476
421
|
}
|
477
422
|
|
478
|
-
int
|
423
|
+
static int refs_configured_ident(git_signature **out, const git_repository *repo)
|
479
424
|
{
|
480
425
|
if (repo->ident_name && repo->ident_email)
|
481
426
|
return git_signature_now(out, repo->ident_name, repo->ident_email);
|
@@ -489,7 +434,7 @@ int git_reference__log_signature(git_signature **out, git_repository *repo)
|
|
489
434
|
int error;
|
490
435
|
git_signature *who;
|
491
436
|
|
492
|
-
if(((error =
|
437
|
+
if(((error = refs_configured_ident(&who, repo)) < 0) &&
|
493
438
|
((error = git_signature_default(&who, repo)) < 0) &&
|
494
439
|
((error = git_signature_now(&who, "unknown", "unknown")) < 0))
|
495
440
|
return error;
|
@@ -626,84 +571,33 @@ int git_reference_symbolic_set_target(
|
|
626
571
|
typedef struct {
|
627
572
|
const char *old_name;
|
628
573
|
git_refname_t new_name;
|
629
|
-
}
|
574
|
+
} refs_update_head_payload;
|
630
575
|
|
631
|
-
static int
|
576
|
+
static int refs_update_head(git_repository *worktree, void *_payload)
|
632
577
|
{
|
633
|
-
|
634
|
-
git_reference *head = NULL;
|
635
|
-
char *gitdir = NULL;
|
578
|
+
refs_update_head_payload *payload = (refs_update_head_payload *)_payload;
|
579
|
+
git_reference *head = NULL, *updated = NULL;
|
636
580
|
int error;
|
637
581
|
|
638
|
-
if ((error =
|
639
|
-
git_error_set(GIT_ERROR_REFERENCE, "could not read HEAD when renaming references");
|
582
|
+
if ((error = git_reference_lookup(&head, worktree, GIT_HEAD_FILE)) < 0)
|
640
583
|
goto out;
|
641
|
-
}
|
642
|
-
|
643
|
-
if ((gitdir = git_path_dirname(path)) == NULL) {
|
644
|
-
error = -1;
|
645
|
-
goto out;
|
646
|
-
}
|
647
584
|
|
648
585
|
if (git_reference_type(head) != GIT_REFERENCE_SYMBOLIC ||
|
649
|
-
git__strcmp(head
|
650
|
-
error = 0;
|
586
|
+
git__strcmp(git_reference_symbolic_target(head), payload->old_name) != 0)
|
651
587
|
goto out;
|
652
|
-
}
|
653
588
|
|
654
|
-
/* Update HEAD it was pointing to the reference being renamed */
|
655
|
-
if ((error =
|
589
|
+
/* Update HEAD if it was pointing to the reference being renamed */
|
590
|
+
if ((error = git_reference_symbolic_set_target(&updated, head, payload->new_name, NULL)) < 0) {
|
656
591
|
git_error_set(GIT_ERROR_REFERENCE, "failed to update HEAD after renaming reference");
|
657
592
|
goto out;
|
658
593
|
}
|
659
594
|
|
660
595
|
out:
|
596
|
+
git_reference_free(updated);
|
661
597
|
git_reference_free(head);
|
662
|
-
git__free(gitdir);
|
663
|
-
|
664
598
|
return error;
|
665
599
|
}
|
666
600
|
|
667
|
-
static int reference__rename(git_reference **out, git_reference *ref, const char *new_name, int force,
|
668
|
-
const git_signature *signature, const char *message)
|
669
|
-
{
|
670
|
-
git_repository *repo;
|
671
|
-
git_refname_t normalized;
|
672
|
-
bool should_head_be_updated = false;
|
673
|
-
int error = 0;
|
674
|
-
|
675
|
-
assert(ref && new_name && signature);
|
676
|
-
|
677
|
-
repo = git_reference_owner(ref);
|
678
|
-
|
679
|
-
if ((error = reference_normalize_for_repo(
|
680
|
-
normalized, repo, new_name, true)) < 0)
|
681
|
-
return error;
|
682
|
-
|
683
|
-
/* Check if we have to update HEAD. */
|
684
|
-
if ((error = git_branch_is_head(ref)) < 0)
|
685
|
-
return error;
|
686
|
-
|
687
|
-
should_head_be_updated = (error > 0);
|
688
|
-
|
689
|
-
if ((error = git_refdb_rename(out, ref->db, ref->name, normalized, force, signature, message)) < 0)
|
690
|
-
return error;
|
691
|
-
|
692
|
-
/* Update HEAD if it was pointing to the reference being renamed */
|
693
|
-
if (should_head_be_updated) {
|
694
|
-
error = git_repository_set_head(ref->db->repo, normalized);
|
695
|
-
} else {
|
696
|
-
rename_cb_data payload;
|
697
|
-
payload.old_name = ref->name;
|
698
|
-
memcpy(&payload.new_name, &normalized, sizeof(normalized));
|
699
|
-
|
700
|
-
error = git_repository_foreach_head(repo, update_wt_heads, &payload);
|
701
|
-
}
|
702
|
-
|
703
|
-
return error;
|
704
|
-
}
|
705
|
-
|
706
|
-
|
707
601
|
int git_reference_rename(
|
708
602
|
git_reference **out,
|
709
603
|
git_reference *ref,
|
@@ -711,17 +605,28 @@ int git_reference_rename(
|
|
711
605
|
int force,
|
712
606
|
const char *log_message)
|
713
607
|
{
|
714
|
-
|
608
|
+
refs_update_head_payload payload;
|
609
|
+
git_signature *signature = NULL;
|
610
|
+
git_repository *repo;
|
715
611
|
int error;
|
716
612
|
|
717
613
|
assert(out && ref);
|
718
614
|
|
719
|
-
|
720
|
-
return error;
|
615
|
+
repo = git_reference_owner(ref);
|
721
616
|
|
722
|
-
error =
|
723
|
-
|
617
|
+
if ((error = git_reference__log_signature(&signature, repo)) < 0 ||
|
618
|
+
(error = reference_normalize_for_repo(payload.new_name, repo, new_name, true)) < 0 ||
|
619
|
+
(error = git_refdb_rename(out, ref->db, ref->name, payload.new_name, force, signature, log_message)) < 0)
|
620
|
+
goto out;
|
621
|
+
|
622
|
+
payload.old_name = ref->name;
|
724
623
|
|
624
|
+
/* We may have to update any HEAD that was pointing to the renamed reference. */
|
625
|
+
if ((error = git_repository_foreach_worktree(repo, refs_update_head, &payload)) < 0)
|
626
|
+
goto out;
|
627
|
+
|
628
|
+
out:
|
629
|
+
git_signature_free(signature);
|
725
630
|
return error;
|
726
631
|
}
|
727
632
|
|
@@ -902,14 +807,13 @@ static int is_valid_ref_char(char ch)
|
|
902
807
|
case '\\':
|
903
808
|
case '?':
|
904
809
|
case '[':
|
905
|
-
case '*':
|
906
810
|
return 0;
|
907
811
|
default:
|
908
812
|
return 1;
|
909
813
|
}
|
910
814
|
}
|
911
815
|
|
912
|
-
static int ensure_segment_validity(const char *name)
|
816
|
+
static int ensure_segment_validity(const char *name, char may_contain_glob)
|
913
817
|
{
|
914
818
|
const char *current = name;
|
915
819
|
char prev = '\0';
|
@@ -932,6 +836,12 @@ static int ensure_segment_validity(const char *name)
|
|
932
836
|
if (prev == '@' && *current == '{')
|
933
837
|
return -1; /* Refname contains "@{" */
|
934
838
|
|
839
|
+
if (*current == '*') {
|
840
|
+
if (!may_contain_glob)
|
841
|
+
return -1;
|
842
|
+
may_contain_glob = 0;
|
843
|
+
}
|
844
|
+
|
935
845
|
prev = *current;
|
936
846
|
}
|
937
847
|
|
@@ -1010,19 +920,20 @@ int git_reference__normalize_name(
|
|
1010
920
|
}
|
1011
921
|
|
1012
922
|
while (true) {
|
1013
|
-
|
1014
|
-
|
1015
|
-
|
1016
|
-
|
1017
|
-
|
1018
|
-
/* Accept one wildcard as a full refname component. */
|
1019
|
-
process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
|
1020
|
-
segment_len = 1;
|
1021
|
-
} else
|
1022
|
-
goto cleanup;
|
1023
|
-
}
|
923
|
+
char may_contain_glob = process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
|
924
|
+
|
925
|
+
segment_len = ensure_segment_validity(current, may_contain_glob);
|
926
|
+
if (segment_len < 0)
|
927
|
+
goto cleanup;
|
1024
928
|
|
1025
929
|
if (segment_len > 0) {
|
930
|
+
/*
|
931
|
+
* There may only be one glob in a pattern, thus we reset
|
932
|
+
* the pattern-flag in case the current segment has one.
|
933
|
+
*/
|
934
|
+
if (memchr(current, '*', segment_len))
|
935
|
+
process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
|
936
|
+
|
1026
937
|
if (normalize) {
|
1027
938
|
size_t cur_len = git_buf_len(buf);
|
1028
939
|
|
@@ -1143,40 +1054,6 @@ int git_reference_cmp(
|
|
1143
1054
|
return git_oid__cmp(&ref1->target.oid, &ref2->target.oid);
|
1144
1055
|
}
|
1145
1056
|
|
1146
|
-
/**
|
1147
|
-
* Get the end of a chain of references. If the final one is not
|
1148
|
-
* found, we return the reference just before that.
|
1149
|
-
*/
|
1150
|
-
static int get_terminal(git_reference **out, git_repository *repo, const char *ref_name, int nesting)
|
1151
|
-
{
|
1152
|
-
git_reference *ref;
|
1153
|
-
int error = 0;
|
1154
|
-
|
1155
|
-
if (nesting > MAX_NESTING_LEVEL) {
|
1156
|
-
git_error_set(GIT_ERROR_REFERENCE, "reference chain too deep (%d)", nesting);
|
1157
|
-
return GIT_ENOTFOUND;
|
1158
|
-
}
|
1159
|
-
|
1160
|
-
/* set to NULL to let the caller know that they're at the end of the chain */
|
1161
|
-
if ((error = git_reference_lookup(&ref, repo, ref_name)) < 0) {
|
1162
|
-
*out = NULL;
|
1163
|
-
return error;
|
1164
|
-
}
|
1165
|
-
|
1166
|
-
if (git_reference_type(ref) == GIT_REFERENCE_DIRECT) {
|
1167
|
-
*out = ref;
|
1168
|
-
error = 0;
|
1169
|
-
} else {
|
1170
|
-
error = get_terminal(out, repo, git_reference_symbolic_target(ref), nesting + 1);
|
1171
|
-
if (error == GIT_ENOTFOUND && !*out)
|
1172
|
-
*out = ref;
|
1173
|
-
else
|
1174
|
-
git_reference_free(ref);
|
1175
|
-
}
|
1176
|
-
|
1177
|
-
return error;
|
1178
|
-
}
|
1179
|
-
|
1180
1057
|
/*
|
1181
1058
|
* Starting with the reference given by `ref_name`, follows symbolic
|
1182
1059
|
* references until a direct reference is found and updated the OID
|
@@ -1191,31 +1068,37 @@ int git_reference__update_terminal(
|
|
1191
1068
|
{
|
1192
1069
|
git_reference *ref = NULL, *ref2 = NULL;
|
1193
1070
|
git_signature *who = NULL;
|
1071
|
+
git_refdb *refdb = NULL;
|
1194
1072
|
const git_signature *to_use;
|
1195
1073
|
int error = 0;
|
1196
1074
|
|
1197
1075
|
if (!sig && (error = git_reference__log_signature(&who, repo)) < 0)
|
1198
|
-
|
1076
|
+
goto out;
|
1199
1077
|
|
1200
1078
|
to_use = sig ? sig : who;
|
1201
|
-
error = get_terminal(&ref, repo, ref_name, 0);
|
1202
1079
|
|
1203
|
-
|
1204
|
-
|
1205
|
-
|
1206
|
-
|
1080
|
+
if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0)
|
1081
|
+
goto out;
|
1082
|
+
|
1083
|
+
if ((error = git_refdb_resolve(&ref, refdb, ref_name, -1)) < 0) {
|
1084
|
+
if (error == GIT_ENOTFOUND) {
|
1085
|
+
git_error_clear();
|
1086
|
+
error = reference__create(&ref2, repo, ref_name, oid, NULL, 0, to_use,
|
1087
|
+
log_message, NULL, NULL);
|
1088
|
+
}
|
1089
|
+
goto out;
|
1090
|
+
}
|
1091
|
+
|
1092
|
+
/* In case the resolved reference is symbolic, then it's a dangling symref. */
|
1093
|
+
if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
|
1207
1094
|
error = reference__create(&ref2, repo, ref->target.symbolic, oid, NULL, 0, to_use,
|
1208
1095
|
log_message, NULL, NULL);
|
1209
|
-
} else
|
1210
|
-
git_error_clear();
|
1211
|
-
error = reference__create(&ref2, repo, ref_name, oid, NULL, 0, to_use,
|
1212
|
-
log_message, NULL, NULL);
|
1213
|
-
} else if (error == 0) {
|
1214
|
-
assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
|
1096
|
+
} else {
|
1215
1097
|
error = reference__create(&ref2, repo, ref->name, oid, NULL, 1, to_use,
|
1216
1098
|
log_message, &ref->target.oid, NULL);
|
1217
1099
|
}
|
1218
1100
|
|
1101
|
+
out:
|
1219
1102
|
git_reference_free(ref2);
|
1220
1103
|
git_reference_free(ref);
|
1221
1104
|
git_signature_free(who);
|
@@ -1379,7 +1262,7 @@ int git_reference_peel(
|
|
1379
1262
|
* to a commit. So we only want to use the peeled value
|
1380
1263
|
* if it is not zero and the target is not a tag.
|
1381
1264
|
*/
|
1382
|
-
if (target_type != GIT_OBJECT_TAG && !
|
1265
|
+
if (target_type != GIT_OBJECT_TAG && !git_oid_is_zero(&resolved->peel)) {
|
1383
1266
|
error = git_object_lookup(&target,
|
1384
1267
|
git_reference_owner(ref), &resolved->peel, GIT_OBJECT_ANY);
|
1385
1268
|
} else {
|
@@ -1404,19 +1287,32 @@ cleanup:
|
|
1404
1287
|
return error;
|
1405
1288
|
}
|
1406
1289
|
|
1407
|
-
int
|
1290
|
+
int git_reference__name_is_valid(
|
1291
|
+
int *valid,
|
1292
|
+
const char *refname,
|
1293
|
+
unsigned int flags)
|
1408
1294
|
{
|
1409
|
-
|
1410
|
-
git_error_clear();
|
1411
|
-
return false;
|
1412
|
-
}
|
1295
|
+
int error;
|
1413
1296
|
|
1414
|
-
|
1297
|
+
*valid = 0;
|
1298
|
+
|
1299
|
+
error = git_reference__normalize_name(NULL, refname, flags);
|
1300
|
+
|
1301
|
+
if (!error)
|
1302
|
+
*valid = 1;
|
1303
|
+
else if (error == GIT_EINVALIDSPEC)
|
1304
|
+
error = 0;
|
1305
|
+
|
1306
|
+
return error;
|
1415
1307
|
}
|
1416
1308
|
|
1417
1309
|
int git_reference_is_valid_name(const char *refname)
|
1418
1310
|
{
|
1419
|
-
|
1311
|
+
int valid = 0;
|
1312
|
+
|
1313
|
+
git_reference__name_is_valid(&valid, refname, GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL);
|
1314
|
+
|
1315
|
+
return valid;
|
1420
1316
|
}
|
1421
1317
|
|
1422
1318
|
const char *git_reference__shorthand(const char *name)
|