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
@@ -10,10 +10,12 @@
|
|
10
10
|
#include "repository.h"
|
11
11
|
#include "filebuf.h"
|
12
12
|
#include "attrcache.h"
|
13
|
+
#include "buf_text.h"
|
13
14
|
#include "git2/blob.h"
|
14
15
|
#include "git2/tree.h"
|
15
16
|
#include "blob.h"
|
16
17
|
#include "index.h"
|
18
|
+
#include "wildmatch.h"
|
17
19
|
#include <ctype.h>
|
18
20
|
|
19
21
|
static void attr_file_free(git_attr_file *file)
|
@@ -39,16 +41,21 @@ int git_attr_file__new(
|
|
39
41
|
|
40
42
|
if (git_mutex_init(&attrs->lock) < 0) {
|
41
43
|
git_error_set(GIT_ERROR_OS, "failed to initialize lock");
|
42
|
-
|
43
|
-
return -1;
|
44
|
+
goto on_error;
|
44
45
|
}
|
45
46
|
|
46
|
-
git_pool_init(&attrs->pool, 1)
|
47
|
+
if (git_pool_init(&attrs->pool, 1) < 0)
|
48
|
+
goto on_error;
|
49
|
+
|
47
50
|
GIT_REFCOUNT_INC(attrs);
|
48
51
|
attrs->entry = entry;
|
49
52
|
attrs->source = source;
|
50
53
|
*out = attrs;
|
51
54
|
return 0;
|
55
|
+
|
56
|
+
on_error:
|
57
|
+
git__free(attrs);
|
58
|
+
return -1;
|
52
59
|
}
|
53
60
|
|
54
61
|
int git_attr_file__clear_rules(git_attr_file *file, bool need_lock)
|
@@ -103,14 +110,22 @@ int git_attr_file__load(
|
|
103
110
|
git_attr_session *attr_session,
|
104
111
|
git_attr_file_entry *entry,
|
105
112
|
git_attr_file_source source,
|
106
|
-
git_attr_file_parser parser
|
113
|
+
git_attr_file_parser parser,
|
114
|
+
bool allow_macros)
|
107
115
|
{
|
108
116
|
int error = 0;
|
117
|
+
git_tree *tree = NULL;
|
118
|
+
git_tree_entry *tree_entry = NULL;
|
109
119
|
git_blob *blob = NULL;
|
110
120
|
git_buf content = GIT_BUF_INIT;
|
121
|
+
const char *content_str;
|
111
122
|
git_attr_file *file;
|
112
123
|
struct stat st;
|
113
124
|
bool nonexistent = false;
|
125
|
+
int bom_offset;
|
126
|
+
git_bom_t bom;
|
127
|
+
git_oid id;
|
128
|
+
git_object_size_t blobsize;
|
114
129
|
|
115
130
|
*out = NULL;
|
116
131
|
|
@@ -119,9 +134,6 @@ int git_attr_file__load(
|
|
119
134
|
/* in-memory attribute file doesn't need data */
|
120
135
|
break;
|
121
136
|
case GIT_ATTR_FILE__FROM_INDEX: {
|
122
|
-
git_oid id;
|
123
|
-
git_off_t blobsize;
|
124
|
-
|
125
137
|
if ((error = attr_file_oid_from_index(&id, repo, entry->path)) < 0 ||
|
126
138
|
(error = git_blob_lookup(&blob, repo, &id)) < 0)
|
127
139
|
return error;
|
@@ -151,6 +163,25 @@ int git_attr_file__load(
|
|
151
163
|
|
152
164
|
break;
|
153
165
|
}
|
166
|
+
case GIT_ATTR_FILE__FROM_HEAD: {
|
167
|
+
if ((error = git_repository_head_tree(&tree, repo)) < 0 ||
|
168
|
+
(error = git_tree_entry_bypath(&tree_entry, tree, entry->path)) < 0 ||
|
169
|
+
(error = git_blob_lookup(&blob, repo, git_tree_entry_id(tree_entry))) < 0)
|
170
|
+
goto cleanup;
|
171
|
+
|
172
|
+
/*
|
173
|
+
* Do not assume that data straight from the ODB is NULL-terminated;
|
174
|
+
* copy the contents of a file to a buffer to work on.
|
175
|
+
*/
|
176
|
+
blobsize = git_blob_rawsize(blob);
|
177
|
+
|
178
|
+
GIT_ERROR_CHECK_BLOBSIZE(blobsize);
|
179
|
+
if ((error = git_buf_put(&content,
|
180
|
+
git_blob_rawcontent(blob), (size_t)blobsize)) < 0)
|
181
|
+
goto cleanup;
|
182
|
+
|
183
|
+
break;
|
184
|
+
}
|
154
185
|
default:
|
155
186
|
git_error_set(GIT_ERROR_INVALID, "unknown file source %d", source);
|
156
187
|
return -1;
|
@@ -159,13 +190,20 @@ int git_attr_file__load(
|
|
159
190
|
if ((error = git_attr_file__new(&file, entry, source)) < 0)
|
160
191
|
goto cleanup;
|
161
192
|
|
193
|
+
/* advance over a UTF8 BOM */
|
194
|
+
content_str = git_buf_cstr(&content);
|
195
|
+
bom_offset = git_buf_text_detect_bom(&bom, &content);
|
196
|
+
|
197
|
+
if (bom == GIT_BOM_UTF8)
|
198
|
+
content_str += bom_offset;
|
199
|
+
|
162
200
|
/* store the key of the attr_reader; don't bother with cache
|
163
201
|
* invalidation during the same attr reader session.
|
164
202
|
*/
|
165
203
|
if (attr_session)
|
166
204
|
file->session_key = attr_session->key;
|
167
205
|
|
168
|
-
if (parser && (error = parser(repo, file,
|
206
|
+
if (parser && (error = parser(repo, file, content_str, allow_macros)) < 0) {
|
169
207
|
git_attr_file__free(file);
|
170
208
|
goto cleanup;
|
171
209
|
}
|
@@ -175,6 +213,8 @@ int git_attr_file__load(
|
|
175
213
|
file->nonexistent = 1;
|
176
214
|
else if (source == GIT_ATTR_FILE__FROM_INDEX)
|
177
215
|
git_oid_cpy(&file->cache_data.oid, git_blob_id(blob));
|
216
|
+
else if (source == GIT_ATTR_FILE__FROM_HEAD)
|
217
|
+
git_oid_cpy(&file->cache_data.oid, git_tree_id(tree));
|
178
218
|
else if (source == GIT_ATTR_FILE__FROM_FILE)
|
179
219
|
git_futils_filestamp_set_from_stat(&file->cache_data.stamp, &st);
|
180
220
|
/* else always cacheable */
|
@@ -183,6 +223,8 @@ int git_attr_file__load(
|
|
183
223
|
|
184
224
|
cleanup:
|
185
225
|
git_blob_free(blob);
|
226
|
+
git_tree_entry_free(tree_entry);
|
227
|
+
git_tree_free(tree);
|
186
228
|
git_buf_dispose(&content);
|
187
229
|
|
188
230
|
return error;
|
@@ -223,6 +265,19 @@ int git_attr_file__out_of_date(
|
|
223
265
|
return (git_oid__cmp(&file->cache_data.oid, &id) != 0);
|
224
266
|
}
|
225
267
|
|
268
|
+
case GIT_ATTR_FILE__FROM_HEAD: {
|
269
|
+
git_tree *tree;
|
270
|
+
int error;
|
271
|
+
|
272
|
+
if ((error = git_repository_head_tree(&tree, repo)) < 0)
|
273
|
+
return error;
|
274
|
+
|
275
|
+
error = git_oid__cmp(&file->cache_data.oid, git_tree_id(tree));
|
276
|
+
|
277
|
+
git_tree_free(tree);
|
278
|
+
return error;
|
279
|
+
}
|
280
|
+
|
226
281
|
default:
|
227
282
|
git_error_set(GIT_ERROR_INVALID, "invalid file type %d", file->source);
|
228
283
|
return -1;
|
@@ -237,16 +292,15 @@ static bool parse_optimized_patterns(
|
|
237
292
|
const char *pattern);
|
238
293
|
|
239
294
|
int git_attr_file__parse_buffer(
|
240
|
-
git_repository *repo, git_attr_file *attrs, const char *data)
|
295
|
+
git_repository *repo, git_attr_file *attrs, const char *data, bool allow_macros)
|
241
296
|
{
|
242
|
-
int error = 0;
|
243
297
|
const char *scan = data, *context = NULL;
|
244
298
|
git_attr_rule *rule = NULL;
|
299
|
+
int error = 0;
|
245
300
|
|
246
|
-
/*
|
247
|
-
if (attrs->entry &&
|
248
|
-
|
249
|
-
!git__suffixcmp(attrs->entry->path, "/" GIT_ATTR_FILE))
|
301
|
+
/* If subdir file path, convert context for file paths */
|
302
|
+
if (attrs->entry && git_path_root(attrs->entry->path) < 0 &&
|
303
|
+
!git__suffixcmp(attrs->entry->path, "/" GIT_ATTR_FILE))
|
250
304
|
context = attrs->entry->path;
|
251
305
|
|
252
306
|
if (git_mutex_lock(&attrs->lock) < 0) {
|
@@ -255,38 +309,38 @@ int git_attr_file__parse_buffer(
|
|
255
309
|
}
|
256
310
|
|
257
311
|
while (!error && *scan) {
|
258
|
-
/*
|
259
|
-
if (!rule
|
260
|
-
|
261
|
-
|
262
|
-
}
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
/*
|
268
|
-
if (
|
269
|
-
|
270
|
-
!(error = git_attr_assignment__parse(
|
271
|
-
repo, &attrs->pool, &rule->assigns, &scan)))
|
312
|
+
/* Allocate rule if needed, otherwise re-use previous rule */
|
313
|
+
if (!rule) {
|
314
|
+
rule = git__calloc(1, sizeof(*rule));
|
315
|
+
GIT_ERROR_CHECK_ALLOC(rule);
|
316
|
+
} else
|
317
|
+
git_attr_rule__clear(rule);
|
318
|
+
|
319
|
+
rule->match.flags = GIT_ATTR_FNMATCH_ALLOWNEG | GIT_ATTR_FNMATCH_ALLOWMACRO;
|
320
|
+
|
321
|
+
/* Parse the next "pattern attr attr attr" line */
|
322
|
+
if ((error = git_attr_fnmatch__parse(&rule->match, &attrs->pool, context, &scan)) < 0 ||
|
323
|
+
(error = git_attr_assignment__parse(repo, &attrs->pool, &rule->assigns, &scan)) < 0)
|
272
324
|
{
|
273
|
-
if (
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
error = git_vector_insert(&attrs->rules, rule);
|
325
|
+
if (error != GIT_ENOTFOUND)
|
326
|
+
goto out;
|
327
|
+
error = 0;
|
328
|
+
continue;
|
278
329
|
}
|
279
330
|
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
331
|
+
if (rule->match.flags & GIT_ATTR_FNMATCH_MACRO) {
|
332
|
+
/* TODO: warning if macro found in file below repo root */
|
333
|
+
if (!allow_macros)
|
334
|
+
continue;
|
335
|
+
if ((error = git_attr_cache__insert_macro(repo, rule)) < 0)
|
336
|
+
goto out;
|
337
|
+
} else if ((error = git_vector_insert(&attrs->rules, rule)) < 0)
|
338
|
+
goto out;
|
339
|
+
|
340
|
+
rule = NULL;
|
288
341
|
}
|
289
342
|
|
343
|
+
out:
|
290
344
|
git_mutex_unlock(&attrs->lock);
|
291
345
|
git_attr_rule__free(rule);
|
292
346
|
|
@@ -333,33 +387,28 @@ int git_attr_file__lookup_one(
|
|
333
387
|
|
334
388
|
int git_attr_file__load_standalone(git_attr_file **out, const char *path)
|
335
389
|
{
|
336
|
-
int error;
|
337
|
-
git_attr_file *file;
|
338
390
|
git_buf content = GIT_BUF_INIT;
|
391
|
+
git_attr_file *file = NULL;
|
392
|
+
int error;
|
339
393
|
|
340
|
-
error =
|
341
|
-
|
342
|
-
return error;
|
394
|
+
if ((error = git_futils_readbuffer(&content, path)) < 0)
|
395
|
+
goto out;
|
343
396
|
|
344
|
-
|
345
|
-
|
346
|
-
if (error < 0) {
|
347
|
-
git_attr_file__free(file);
|
348
|
-
return error;
|
349
|
-
}
|
350
|
-
/* because the cache entry is allocated from the file's own pool, we
|
397
|
+
/*
|
398
|
+
* Because the cache entry is allocated from the file's own pool, we
|
351
399
|
* don't have to free it - freeing file+pool will free cache entry, too.
|
352
400
|
*/
|
353
401
|
|
354
|
-
if (
|
355
|
-
|
356
|
-
|
357
|
-
|
402
|
+
if ((error = git_attr_file__new(&file, NULL, GIT_ATTR_FILE__FROM_FILE)) < 0 ||
|
403
|
+
(error = git_attr_file__parse_buffer(NULL, file, content.ptr, true)) < 0 ||
|
404
|
+
(error = git_attr_cache__alloc_file_entry(&file->entry, NULL, path, &file->pool)) < 0)
|
405
|
+
goto out;
|
358
406
|
|
407
|
+
*out = file;
|
408
|
+
out:
|
359
409
|
if (error < 0)
|
360
410
|
git_attr_file__free(file);
|
361
|
-
|
362
|
-
*out = file;
|
411
|
+
git_buf_dispose(&content);
|
363
412
|
|
364
413
|
return error;
|
365
414
|
}
|
@@ -390,18 +439,13 @@ bool git_attr_fnmatch__match(
|
|
390
439
|
}
|
391
440
|
|
392
441
|
if (match->flags & GIT_ATTR_FNMATCH_ICASE)
|
393
|
-
flags |=
|
394
|
-
if (match->flags & GIT_ATTR_FNMATCH_LEADINGDIR)
|
395
|
-
flags |= FNM_LEADING_DIR;
|
442
|
+
flags |= WM_CASEFOLD;
|
396
443
|
|
397
444
|
if (match->flags & GIT_ATTR_FNMATCH_FULLPATH) {
|
398
445
|
filename = relpath;
|
399
|
-
flags |=
|
446
|
+
flags |= WM_PATHNAME;
|
400
447
|
} else {
|
401
448
|
filename = path->basename;
|
402
|
-
|
403
|
-
if (path->is_dir)
|
404
|
-
flags |= FNM_LEADING_DIR;
|
405
449
|
}
|
406
450
|
|
407
451
|
if ((match->flags & GIT_ATTR_FNMATCH_DIRECTORY) && !path->is_dir) {
|
@@ -416,8 +460,6 @@ bool git_attr_fnmatch__match(
|
|
416
460
|
path->basename == relpath)
|
417
461
|
return false;
|
418
462
|
|
419
|
-
flags |= FNM_LEADING_DIR;
|
420
|
-
|
421
463
|
/* fail match if this is a file with same name as ignored folder */
|
422
464
|
samename = (match->flags & GIT_ATTR_FNMATCH_ICASE) ?
|
423
465
|
!strcasecmp(match->pattern, relpath) :
|
@@ -426,10 +468,10 @@ bool git_attr_fnmatch__match(
|
|
426
468
|
if (samename)
|
427
469
|
return false;
|
428
470
|
|
429
|
-
return (
|
471
|
+
return (wildmatch(match->pattern, relpath, flags) == WM_MATCH);
|
430
472
|
}
|
431
473
|
|
432
|
-
return (
|
474
|
+
return (wildmatch(match->pattern, filename, flags) == WM_MATCH);
|
433
475
|
}
|
434
476
|
|
435
477
|
bool git_attr_rule__match(
|
@@ -548,6 +590,61 @@ void git_attr_path__free(git_attr_path *info)
|
|
548
590
|
* "cat-file.c" but not "mozilla-sha1/sha1.c".
|
549
591
|
*/
|
550
592
|
|
593
|
+
/*
|
594
|
+
* Determine the length of trailing spaces. Escaped spaces do not count as
|
595
|
+
* trailing whitespace.
|
596
|
+
*/
|
597
|
+
static size_t trailing_space_length(const char *p, size_t len)
|
598
|
+
{
|
599
|
+
size_t n, i;
|
600
|
+
for (n = len; n; n--) {
|
601
|
+
if (p[n-1] != ' ' && p[n-1] != '\t')
|
602
|
+
break;
|
603
|
+
|
604
|
+
/*
|
605
|
+
* Count escape-characters before space. In case where it's an
|
606
|
+
* even number of escape characters, then the escape char itself
|
607
|
+
* is escaped and the whitespace is an unescaped whitespace.
|
608
|
+
* Otherwise, the last escape char is not escaped and the
|
609
|
+
* whitespace in an escaped whitespace.
|
610
|
+
*/
|
611
|
+
i = n;
|
612
|
+
while (i > 1 && p[i-2] == '\\')
|
613
|
+
i--;
|
614
|
+
if ((n - i) % 2)
|
615
|
+
break;
|
616
|
+
}
|
617
|
+
return len - n;
|
618
|
+
}
|
619
|
+
|
620
|
+
static size_t unescape_spaces(char *str)
|
621
|
+
{
|
622
|
+
char *scan, *pos = str;
|
623
|
+
bool escaped = false;
|
624
|
+
|
625
|
+
if (!str)
|
626
|
+
return 0;
|
627
|
+
|
628
|
+
for (scan = str; *scan; scan++) {
|
629
|
+
if (!escaped && *scan == '\\') {
|
630
|
+
escaped = true;
|
631
|
+
continue;
|
632
|
+
}
|
633
|
+
|
634
|
+
/* Only insert the escape character for escaped non-spaces */
|
635
|
+
if (escaped && !git__isspace(*scan))
|
636
|
+
*pos++ = '\\';
|
637
|
+
|
638
|
+
*pos++ = *scan;
|
639
|
+
escaped = false;
|
640
|
+
}
|
641
|
+
|
642
|
+
if (pos != scan)
|
643
|
+
*pos = '\0';
|
644
|
+
|
645
|
+
return (pos - str);
|
646
|
+
}
|
647
|
+
|
551
648
|
/*
|
552
649
|
* This will return 0 if the spec was filled out,
|
553
650
|
* GIT_ENOTFOUND if the fnmatch does not require matching, or
|
@@ -561,6 +658,7 @@ int git_attr_fnmatch__parse(
|
|
561
658
|
{
|
562
659
|
const char *pattern, *scan;
|
563
660
|
int slash_count, allow_space;
|
661
|
+
bool escaped;
|
564
662
|
|
565
663
|
assert(spec && base && *base);
|
566
664
|
|
@@ -572,8 +670,11 @@ int git_attr_fnmatch__parse(
|
|
572
670
|
|
573
671
|
pattern = *base;
|
574
672
|
|
575
|
-
while (git__isspace(*pattern))
|
576
|
-
|
673
|
+
while (!allow_space && git__isspace(*pattern))
|
674
|
+
pattern++;
|
675
|
+
|
676
|
+
if (!*pattern || *pattern == '#' || *pattern == '\n' ||
|
677
|
+
(*pattern == '\r' && *(pattern + 1) == '\n')) {
|
577
678
|
*base = git__next_line(pattern);
|
578
679
|
return GIT_ENOTFOUND;
|
579
680
|
}
|
@@ -588,29 +689,33 @@ int git_attr_fnmatch__parse(
|
|
588
689
|
|
589
690
|
if (*pattern == '!' && (spec->flags & GIT_ATTR_FNMATCH_ALLOWNEG) != 0) {
|
590
691
|
spec->flags = spec->flags | GIT_ATTR_FNMATCH_NEGATIVE;
|
591
|
-
if ((spec->flags & GIT_ATTR_FNMATCH_NOLEADINGDIR) == 0)
|
592
|
-
spec->flags |= GIT_ATTR_FNMATCH_LEADINGDIR;
|
593
692
|
pattern++;
|
594
693
|
}
|
595
694
|
|
596
695
|
slash_count = 0;
|
696
|
+
escaped = false;
|
697
|
+
/* Scan until a non-escaped whitespace. */
|
597
698
|
for (scan = pattern; *scan != '\0'; ++scan) {
|
598
|
-
|
599
|
-
if (git__isspace(*scan) && *(scan - 1) != '\\') {
|
600
|
-
if (!allow_space || (*scan != ' ' && *scan != '\t' && *scan != '\r'))
|
601
|
-
break;
|
602
|
-
}
|
699
|
+
char c = *scan;
|
603
700
|
|
604
|
-
if (
|
701
|
+
if (c == '\\' && !escaped) {
|
702
|
+
escaped = true;
|
703
|
+
continue;
|
704
|
+
} else if (git__isspace(c) && !escaped) {
|
705
|
+
if (!allow_space || (c != ' ' && c != '\t' && c != '\r'))
|
706
|
+
break;
|
707
|
+
} else if (c == '/') {
|
605
708
|
spec->flags = spec->flags | GIT_ATTR_FNMATCH_FULLPATH;
|
606
709
|
slash_count++;
|
607
|
-
|
710
|
+
|
711
|
+
if (slash_count == 1 && pattern == scan)
|
608
712
|
pattern++;
|
609
|
-
}
|
610
|
-
|
611
|
-
else if (git__iswildcard(*scan) &&
|
612
|
-
(scan == pattern || (*(scan - 1) != '\\')))
|
713
|
+
} else if (git__iswildcard(c) && !escaped) {
|
714
|
+
/* remember if we see an unescaped wildcard in pattern */
|
613
715
|
spec->flags = spec->flags | GIT_ATTR_FNMATCH_HASWILD;
|
716
|
+
}
|
717
|
+
|
718
|
+
escaped = false;
|
614
719
|
}
|
615
720
|
|
616
721
|
*base = scan;
|
@@ -628,9 +733,10 @@ int git_attr_fnmatch__parse(
|
|
628
733
|
return GIT_ENOTFOUND;
|
629
734
|
|
630
735
|
/* Remove trailing spaces. */
|
631
|
-
|
632
|
-
|
633
|
-
|
736
|
+
spec->length -= trailing_space_length(pattern, spec->length);
|
737
|
+
|
738
|
+
if (spec->length == 0)
|
739
|
+
return GIT_ENOTFOUND;
|
634
740
|
|
635
741
|
if (pattern[spec->length - 1] == '/') {
|
636
742
|
spec->length--;
|
@@ -638,14 +744,6 @@ int git_attr_fnmatch__parse(
|
|
638
744
|
if (--slash_count <= 0)
|
639
745
|
spec->flags = spec->flags & ~GIT_ATTR_FNMATCH_FULLPATH;
|
640
746
|
}
|
641
|
-
if ((spec->flags & GIT_ATTR_FNMATCH_NOLEADINGDIR) == 0 &&
|
642
|
-
spec->length >= 2 &&
|
643
|
-
pattern[spec->length - 1] == '*' &&
|
644
|
-
pattern[spec->length - 2] == '/') {
|
645
|
-
spec->length -= 2;
|
646
|
-
spec->flags = spec->flags | GIT_ATTR_FNMATCH_LEADINGDIR;
|
647
|
-
/* leave FULLPATH match on, however */
|
648
|
-
}
|
649
747
|
|
650
748
|
if (context) {
|
651
749
|
char *slash = strrchr(context, '/');
|
@@ -664,9 +762,8 @@ int git_attr_fnmatch__parse(
|
|
664
762
|
*base = git__next_line(pattern);
|
665
763
|
return -1;
|
666
764
|
} else {
|
667
|
-
/* strip '\' that might have
|
668
|
-
spec->length =
|
669
|
-
/* TODO: convert remaining '\' into '/' for POSIX ??? */
|
765
|
+
/* strip '\' that might have been used for internal whitespace */
|
766
|
+
spec->length = unescape_spaces(spec->pattern);
|
670
767
|
}
|
671
768
|
|
672
769
|
return 0;
|
@@ -859,6 +956,7 @@ int git_attr_session__init(git_attr_session *session, git_repository *repo)
|
|
859
956
|
{
|
860
957
|
assert(repo);
|
861
958
|
|
959
|
+
memset(session, 0, sizeof(*session));
|
862
960
|
session->key = git_atomic_inc(&repo->attr_session_key);
|
863
961
|
|
864
962
|
return 0;
|