rugged 0.28.4 → 0.28.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (350) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rugged/version.rb +1 -1
  3. data/vendor/libgit2/AUTHORS +0 -1
  4. data/vendor/libgit2/CMakeLists.txt +16 -36
  5. data/vendor/libgit2/COPYING +0 -28
  6. data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +1 -5
  7. data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
  8. data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
  9. data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
  10. data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +0 -6
  11. data/vendor/libgit2/deps/http-parser/http_parser.c +6 -11
  12. data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
  13. data/vendor/libgit2/deps/regex/COPYING +502 -0
  14. data/vendor/libgit2/deps/regex/config.h +7 -0
  15. data/vendor/libgit2/deps/regex/regcomp.c +3857 -0
  16. data/vendor/libgit2/deps/regex/regex.c +92 -0
  17. data/vendor/libgit2/deps/regex/regex.h +582 -0
  18. data/vendor/libgit2/deps/regex/regex_internal.c +1744 -0
  19. data/vendor/libgit2/deps/regex/regex_internal.h +819 -0
  20. data/vendor/libgit2/deps/regex/regexec.c +4369 -0
  21. data/vendor/libgit2/deps/zlib/adler32.c +7 -0
  22. data/vendor/libgit2/deps/zlib/crc32.c +7 -0
  23. data/vendor/libgit2/include/git2.h +0 -2
  24. data/vendor/libgit2/include/git2/apply.h +2 -22
  25. data/vendor/libgit2/include/git2/attr.h +12 -19
  26. data/vendor/libgit2/include/git2/blame.h +2 -2
  27. data/vendor/libgit2/include/git2/blob.h +12 -44
  28. data/vendor/libgit2/include/git2/buffer.h +14 -20
  29. data/vendor/libgit2/include/git2/checkout.h +14 -46
  30. data/vendor/libgit2/include/git2/cherrypick.h +3 -3
  31. data/vendor/libgit2/include/git2/clone.h +2 -2
  32. data/vendor/libgit2/include/git2/commit.h +1 -23
  33. data/vendor/libgit2/include/git2/common.h +5 -7
  34. data/vendor/libgit2/include/git2/config.h +12 -12
  35. data/vendor/libgit2/include/git2/deprecated.h +3 -243
  36. data/vendor/libgit2/include/git2/describe.h +4 -4
  37. data/vendor/libgit2/include/git2/diff.h +14 -16
  38. data/vendor/libgit2/include/git2/filter.h +0 -8
  39. data/vendor/libgit2/include/git2/index.h +1 -2
  40. data/vendor/libgit2/include/git2/indexer.h +4 -48
  41. data/vendor/libgit2/include/git2/inttypes.h +309 -0
  42. data/vendor/libgit2/include/git2/merge.h +10 -6
  43. data/vendor/libgit2/include/git2/net.h +5 -0
  44. data/vendor/libgit2/include/git2/object.h +14 -2
  45. data/vendor/libgit2/include/git2/odb.h +2 -3
  46. data/vendor/libgit2/include/git2/odb_backend.h +4 -5
  47. data/vendor/libgit2/include/git2/oid.h +1 -1
  48. data/vendor/libgit2/include/git2/pack.h +1 -12
  49. data/vendor/libgit2/include/git2/proxy.h +3 -5
  50. data/vendor/libgit2/include/git2/rebase.h +2 -46
  51. data/vendor/libgit2/include/git2/refs.h +0 -19
  52. data/vendor/libgit2/include/git2/remote.h +12 -35
  53. data/vendor/libgit2/include/git2/repository.h +2 -24
  54. data/vendor/libgit2/include/git2/revert.h +1 -1
  55. data/vendor/libgit2/include/git2/stash.h +3 -3
  56. data/vendor/libgit2/include/git2/status.h +16 -25
  57. data/vendor/libgit2/include/git2/submodule.h +3 -20
  58. data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
  59. data/vendor/libgit2/include/git2/sys/odb_backend.h +4 -48
  60. data/vendor/libgit2/include/git2/sys/refdb_backend.h +21 -57
  61. data/vendor/libgit2/include/git2/sys/repository.h +1 -5
  62. data/vendor/libgit2/include/git2/sys/time.h +31 -0
  63. data/vendor/libgit2/include/git2/sys/transport.h +2 -2
  64. data/vendor/libgit2/include/git2/tag.h +2 -11
  65. data/vendor/libgit2/include/git2/trace.h +2 -2
  66. data/vendor/libgit2/include/git2/transport.h +340 -11
  67. data/vendor/libgit2/include/git2/tree.h +1 -1
  68. data/vendor/libgit2/include/git2/types.h +89 -4
  69. data/vendor/libgit2/include/git2/version.h +2 -2
  70. data/vendor/libgit2/include/git2/worktree.h +5 -5
  71. data/vendor/libgit2/libgit2.pc.in +13 -0
  72. data/vendor/libgit2/src/CMakeLists.txt +222 -88
  73. data/vendor/libgit2/src/alloc.c +14 -2
  74. data/vendor/libgit2/src/apply.c +30 -60
  75. data/vendor/libgit2/src/attr.c +64 -70
  76. data/vendor/libgit2/src/attr_file.c +96 -189
  77. data/vendor/libgit2/src/attr_file.h +9 -9
  78. data/vendor/libgit2/src/attrcache.c +46 -44
  79. data/vendor/libgit2/src/attrcache.h +1 -2
  80. data/vendor/libgit2/src/blame.c +5 -17
  81. data/vendor/libgit2/src/blame.h +1 -1
  82. data/vendor/libgit2/src/blame_git.c +7 -21
  83. data/vendor/libgit2/src/blob.c +17 -81
  84. data/vendor/libgit2/src/blob.h +2 -2
  85. data/vendor/libgit2/src/branch.c +5 -29
  86. data/vendor/libgit2/src/buffer.c +7 -14
  87. data/vendor/libgit2/src/cache.c +33 -26
  88. data/vendor/libgit2/src/cache.h +1 -1
  89. data/vendor/libgit2/src/cc-compat.h +0 -5
  90. data/vendor/libgit2/src/checkout.c +16 -26
  91. data/vendor/libgit2/src/cherrypick.c +3 -9
  92. data/vendor/libgit2/src/clone.c +7 -29
  93. data/vendor/libgit2/src/clone.h +0 -4
  94. data/vendor/libgit2/src/commit.c +21 -69
  95. data/vendor/libgit2/src/commit.h +0 -6
  96. data/vendor/libgit2/src/commit_list.c +76 -28
  97. data/vendor/libgit2/src/commit_list.h +2 -2
  98. data/vendor/libgit2/src/common.h +75 -3
  99. data/vendor/libgit2/src/config.c +40 -31
  100. data/vendor/libgit2/src/config.h +6 -7
  101. data/vendor/libgit2/src/config_backend.h +0 -12
  102. data/vendor/libgit2/src/config_cache.c +39 -39
  103. data/vendor/libgit2/src/config_entries.c +99 -69
  104. data/vendor/libgit2/src/config_entries.h +0 -1
  105. data/vendor/libgit2/src/config_file.c +380 -337
  106. data/vendor/libgit2/src/config_mem.c +16 -12
  107. data/vendor/libgit2/src/config_parse.c +29 -49
  108. data/vendor/libgit2/src/config_parse.h +12 -13
  109. data/vendor/libgit2/src/crlf.c +14 -14
  110. data/vendor/libgit2/src/describe.c +20 -21
  111. data/vendor/libgit2/src/diff.c +58 -43
  112. data/vendor/libgit2/src/diff.h +1 -2
  113. data/vendor/libgit2/src/diff_driver.c +38 -37
  114. data/vendor/libgit2/src/diff_file.c +7 -9
  115. data/vendor/libgit2/src/diff_file.h +1 -1
  116. data/vendor/libgit2/src/diff_generate.c +85 -135
  117. data/vendor/libgit2/src/diff_generate.h +2 -2
  118. data/vendor/libgit2/src/diff_parse.c +1 -1
  119. data/vendor/libgit2/src/diff_print.c +13 -25
  120. data/vendor/libgit2/src/diff_stats.c +1 -1
  121. data/vendor/libgit2/src/diff_tform.c +4 -4
  122. data/vendor/libgit2/src/errors.c +22 -12
  123. data/vendor/libgit2/src/features.h.in +2 -9
  124. data/vendor/libgit2/src/fetch.c +2 -7
  125. data/vendor/libgit2/src/fetchhead.c +1 -1
  126. data/vendor/libgit2/src/filebuf.c +10 -6
  127. data/vendor/libgit2/src/filebuf.h +2 -2
  128. data/vendor/libgit2/src/{futils.c → fileops.c} +17 -21
  129. data/vendor/libgit2/src/{futils.h → fileops.h} +5 -5
  130. data/vendor/libgit2/src/filter.c +8 -16
  131. data/vendor/libgit2/src/fnmatch.c +248 -0
  132. data/vendor/libgit2/src/fnmatch.h +48 -0
  133. data/vendor/libgit2/src/global.c +40 -12
  134. data/vendor/libgit2/src/global.h +2 -0
  135. data/vendor/libgit2/src/hash.c +0 -61
  136. data/vendor/libgit2/src/hash.h +21 -19
  137. data/vendor/libgit2/src/hash/{sha1/collisiondetect.c → hash_collisiondetect.h} +17 -14
  138. data/vendor/libgit2/src/hash/{sha1/common_crypto.c → hash_common_crypto.h} +19 -15
  139. data/vendor/libgit2/src/hash/{sha1/generic.c → hash_generic.c} +10 -22
  140. data/vendor/libgit2/src/hash/{sha1/generic.h → hash_generic.h} +14 -4
  141. data/vendor/libgit2/src/hash/{sha1/mbedtls.c → hash_mbedtls.c} +7 -15
  142. data/vendor/libgit2/src/hash/{sha1/mbedtls.h → hash_mbedtls.h} +11 -6
  143. data/vendor/libgit2/src/hash/{sha1/openssl.c → hash_openssl.h} +18 -14
  144. data/vendor/libgit2/src/hash/{sha1/win32.c → hash_win32.c} +24 -34
  145. data/vendor/libgit2/src/hash/{sha1/win32.h → hash_win32.h} +19 -6
  146. data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/sha1.c +3 -14
  147. data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/sha1.h +0 -0
  148. data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/ubc_check.c +0 -0
  149. data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/ubc_check.h +0 -0
  150. data/vendor/libgit2/src/hashsig.c +1 -1
  151. data/vendor/libgit2/src/idxmap.c +65 -91
  152. data/vendor/libgit2/src/idxmap.h +15 -151
  153. data/vendor/libgit2/src/ignore.c +38 -32
  154. data/vendor/libgit2/src/index.c +43 -66
  155. data/vendor/libgit2/src/index.h +1 -1
  156. data/vendor/libgit2/src/indexer.c +70 -69
  157. data/vendor/libgit2/src/integer.h +4 -39
  158. data/vendor/libgit2/src/iterator.c +22 -27
  159. data/vendor/libgit2/src/map.h +1 -1
  160. data/vendor/libgit2/src/merge.c +44 -58
  161. data/vendor/libgit2/src/merge_driver.c +4 -4
  162. data/vendor/libgit2/src/merge_file.c +1 -1
  163. data/vendor/libgit2/src/mwindow.c +23 -18
  164. data/vendor/libgit2/src/mwindow.h +4 -4
  165. data/vendor/libgit2/src/netops.c +165 -55
  166. data/vendor/libgit2/src/netops.h +25 -3
  167. data/vendor/libgit2/src/notes.c +2 -2
  168. data/vendor/libgit2/src/object.c +2 -2
  169. data/vendor/libgit2/src/object.h +0 -2
  170. data/vendor/libgit2/src/odb.c +23 -41
  171. data/vendor/libgit2/src/odb.h +2 -3
  172. data/vendor/libgit2/src/odb_loose.c +10 -17
  173. data/vendor/libgit2/src/odb_mempack.c +23 -10
  174. data/vendor/libgit2/src/odb_pack.c +4 -4
  175. data/vendor/libgit2/src/offmap.c +55 -43
  176. data/vendor/libgit2/src/offmap.h +24 -102
  177. data/vendor/libgit2/src/oid.c +1 -6
  178. data/vendor/libgit2/src/oidmap.c +57 -39
  179. data/vendor/libgit2/src/oidmap.h +19 -99
  180. data/vendor/libgit2/src/pack-objects.c +32 -25
  181. data/vendor/libgit2/src/pack-objects.h +1 -1
  182. data/vendor/libgit2/src/pack.c +47 -45
  183. data/vendor/libgit2/src/pack.h +14 -12
  184. data/vendor/libgit2/src/parse.c +0 -10
  185. data/vendor/libgit2/src/parse.h +3 -3
  186. data/vendor/libgit2/src/patch.c +1 -1
  187. data/vendor/libgit2/src/patch_generate.c +2 -2
  188. data/vendor/libgit2/src/patch_parse.c +31 -124
  189. data/vendor/libgit2/src/path.c +6 -43
  190. data/vendor/libgit2/src/path.h +0 -2
  191. data/vendor/libgit2/src/pathspec.c +13 -13
  192. data/vendor/libgit2/src/pool.c +22 -26
  193. data/vendor/libgit2/src/pool.h +7 -7
  194. data/vendor/libgit2/src/posix.c +7 -7
  195. data/vendor/libgit2/src/posix.h +1 -12
  196. data/vendor/libgit2/src/proxy.c +2 -7
  197. data/vendor/libgit2/src/push.c +5 -10
  198. data/vendor/libgit2/src/reader.c +2 -2
  199. data/vendor/libgit2/src/rebase.c +7 -66
  200. data/vendor/libgit2/src/refdb.c +0 -12
  201. data/vendor/libgit2/src/refdb_fs.c +165 -214
  202. data/vendor/libgit2/src/reflog.c +13 -11
  203. data/vendor/libgit2/src/refs.c +18 -24
  204. data/vendor/libgit2/src/refspec.c +16 -9
  205. data/vendor/libgit2/src/remote.c +52 -50
  206. data/vendor/libgit2/src/remote.h +2 -2
  207. data/vendor/libgit2/src/repository.c +100 -115
  208. data/vendor/libgit2/src/repository.h +40 -49
  209. data/vendor/libgit2/src/revert.c +3 -8
  210. data/vendor/libgit2/src/revparse.c +19 -18
  211. data/vendor/libgit2/src/revwalk.c +30 -63
  212. data/vendor/libgit2/src/revwalk.h +0 -20
  213. data/vendor/libgit2/src/settings.c +0 -5
  214. data/vendor/libgit2/src/sortedcache.c +26 -12
  215. data/vendor/libgit2/src/sortedcache.h +1 -1
  216. data/vendor/libgit2/src/stash.c +65 -45
  217. data/vendor/libgit2/src/status.c +9 -15
  218. data/vendor/libgit2/src/{allocators/stdalloc.c → stdalloc.c} +4 -3
  219. data/vendor/libgit2/src/{allocators/stdalloc.h → stdalloc.h} +4 -4
  220. data/vendor/libgit2/src/streams/openssl.c +0 -20
  221. data/vendor/libgit2/src/streams/socket.c +2 -2
  222. data/vendor/libgit2/src/strmap.c +84 -37
  223. data/vendor/libgit2/src/strmap.h +33 -105
  224. data/vendor/libgit2/src/submodule.c +70 -102
  225. data/vendor/libgit2/src/submodule.h +1 -1
  226. data/vendor/libgit2/src/sysdir.c +1 -11
  227. data/vendor/libgit2/src/tag.c +2 -10
  228. data/vendor/libgit2/src/trace.c +1 -1
  229. data/vendor/libgit2/src/trace.h +2 -2
  230. data/vendor/libgit2/src/trailer.c +32 -46
  231. data/vendor/libgit2/src/transaction.c +9 -10
  232. data/vendor/libgit2/src/transports/auth.c +9 -10
  233. data/vendor/libgit2/src/transports/auth.h +4 -11
  234. data/vendor/libgit2/src/transports/auth_negotiate.c +9 -23
  235. data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
  236. data/vendor/libgit2/src/transports/cred.c +6 -6
  237. data/vendor/libgit2/src/{allocators/win32_crtdbg.h → transports/cred.h} +4 -5
  238. data/vendor/libgit2/src/transports/git.c +16 -11
  239. data/vendor/libgit2/src/transports/http.c +276 -419
  240. data/vendor/libgit2/src/transports/http.h +1 -1
  241. data/vendor/libgit2/src/transports/local.c +9 -9
  242. data/vendor/libgit2/src/transports/smart.c +17 -17
  243. data/vendor/libgit2/src/transports/smart.h +2 -2
  244. data/vendor/libgit2/src/transports/smart_protocol.c +60 -36
  245. data/vendor/libgit2/src/transports/ssh.c +36 -46
  246. data/vendor/libgit2/src/transports/winhttp.c +207 -231
  247. data/vendor/libgit2/src/tree-cache.c +7 -14
  248. data/vendor/libgit2/src/tree.c +24 -10
  249. data/vendor/libgit2/src/unix/map.c +1 -1
  250. data/vendor/libgit2/src/unix/posix.h +11 -1
  251. data/vendor/libgit2/src/userdiff.h +1 -3
  252. data/vendor/libgit2/src/util.c +53 -51
  253. data/vendor/libgit2/src/util.h +21 -16
  254. data/vendor/libgit2/src/win32/map.c +5 -3
  255. data/vendor/libgit2/src/win32/path_w32.c +2 -12
  256. data/vendor/libgit2/src/win32/path_w32.h +29 -0
  257. data/vendor/libgit2/src/win32/posix.h +4 -1
  258. data/vendor/libgit2/src/win32/posix_w32.c +5 -40
  259. data/vendor/libgit2/src/win32/precompiled.h +2 -0
  260. data/vendor/libgit2/src/win32/thread.c +10 -5
  261. data/vendor/libgit2/src/win32/w32_buffer.c +3 -7
  262. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +93 -0
  263. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +2 -0
  264. data/vendor/libgit2/src/win32/w32_stack.c +9 -4
  265. data/vendor/libgit2/src/win32/w32_stack.h +3 -3
  266. data/vendor/libgit2/src/win32/w32_util.c +0 -31
  267. data/vendor/libgit2/src/win32/w32_util.h +32 -6
  268. data/vendor/libgit2/src/worktree.c +22 -36
  269. data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
  270. data/vendor/libgit2/src/xdiff/xmerge.c +0 -12
  271. data/vendor/libgit2/src/xdiff/xpatience.c +0 -3
  272. metadata +34 -98
  273. data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +0 -28
  274. data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +0 -38
  275. data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +0 -37
  276. data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +0 -110
  277. data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +0 -53
  278. data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +0 -124
  279. data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +0 -66
  280. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +0 -21
  281. data/vendor/libgit2/deps/ntlmclient/compat.h +0 -33
  282. data/vendor/libgit2/deps/ntlmclient/crypt.h +0 -64
  283. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +0 -120
  284. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +0 -18
  285. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +0 -145
  286. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +0 -18
  287. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +0 -130
  288. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +0 -21
  289. data/vendor/libgit2/deps/ntlmclient/ntlm.c +0 -1420
  290. data/vendor/libgit2/deps/ntlmclient/ntlm.h +0 -174
  291. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +0 -320
  292. data/vendor/libgit2/deps/ntlmclient/unicode.h +0 -36
  293. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +0 -445
  294. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +0 -201
  295. data/vendor/libgit2/deps/ntlmclient/utf8.h +0 -1257
  296. data/vendor/libgit2/deps/ntlmclient/util.c +0 -21
  297. data/vendor/libgit2/deps/ntlmclient/util.h +0 -14
  298. data/vendor/libgit2/deps/pcre/CMakeLists.txt +0 -140
  299. data/vendor/libgit2/deps/pcre/COPYING +0 -5
  300. data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +0 -22
  301. data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +0 -17
  302. data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +0 -58
  303. data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +0 -29
  304. data/vendor/libgit2/deps/pcre/config.h.in +0 -57
  305. data/vendor/libgit2/deps/pcre/pcre.h +0 -641
  306. data/vendor/libgit2/deps/pcre/pcre_byte_order.c +0 -319
  307. data/vendor/libgit2/deps/pcre/pcre_chartables.c +0 -198
  308. data/vendor/libgit2/deps/pcre/pcre_compile.c +0 -9800
  309. data/vendor/libgit2/deps/pcre/pcre_config.c +0 -190
  310. data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +0 -3676
  311. data/vendor/libgit2/deps/pcre/pcre_exec.c +0 -7173
  312. data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +0 -245
  313. data/vendor/libgit2/deps/pcre/pcre_get.c +0 -669
  314. data/vendor/libgit2/deps/pcre/pcre_globals.c +0 -86
  315. data/vendor/libgit2/deps/pcre/pcre_internal.h +0 -2787
  316. data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +0 -11913
  317. data/vendor/libgit2/deps/pcre/pcre_maketables.c +0 -156
  318. data/vendor/libgit2/deps/pcre/pcre_newline.c +0 -210
  319. data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +0 -94
  320. data/vendor/libgit2/deps/pcre/pcre_printint.c +0 -834
  321. data/vendor/libgit2/deps/pcre/pcre_refcount.c +0 -92
  322. data/vendor/libgit2/deps/pcre/pcre_string_utils.c +0 -211
  323. data/vendor/libgit2/deps/pcre/pcre_study.c +0 -1686
  324. data/vendor/libgit2/deps/pcre/pcre_tables.c +0 -727
  325. data/vendor/libgit2/deps/pcre/pcre_ucd.c +0 -3644
  326. data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +0 -301
  327. data/vendor/libgit2/deps/pcre/pcre_version.c +0 -98
  328. data/vendor/libgit2/deps/pcre/pcre_xclass.c +0 -268
  329. data/vendor/libgit2/deps/pcre/pcreposix.c +0 -421
  330. data/vendor/libgit2/deps/pcre/pcreposix.h +0 -117
  331. data/vendor/libgit2/deps/pcre/ucp.h +0 -224
  332. data/vendor/libgit2/include/git2/cert.h +0 -135
  333. data/vendor/libgit2/include/git2/cred.h +0 -308
  334. data/vendor/libgit2/include/git2/sys/cred.h +0 -90
  335. data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
  336. data/vendor/libgit2/src/config_snapshot.c +0 -206
  337. data/vendor/libgit2/src/errors.h +0 -81
  338. data/vendor/libgit2/src/hash/sha1.h +0 -38
  339. data/vendor/libgit2/src/hash/sha1/collisiondetect.h +0 -19
  340. data/vendor/libgit2/src/hash/sha1/common_crypto.h +0 -19
  341. data/vendor/libgit2/src/hash/sha1/openssl.h +0 -19
  342. data/vendor/libgit2/src/net.c +0 -184
  343. data/vendor/libgit2/src/net.h +0 -36
  344. data/vendor/libgit2/src/regexp.c +0 -221
  345. data/vendor/libgit2/src/regexp.h +0 -97
  346. data/vendor/libgit2/src/transports/auth_ntlm.c +0 -223
  347. data/vendor/libgit2/src/transports/auth_ntlm.h +0 -35
  348. data/vendor/libgit2/src/wildmatch.c +0 -320
  349. data/vendor/libgit2/src/wildmatch.h +0 -23
  350. data/vendor/libgit2/src/win32/w32_common.h +0 -39
@@ -7,8 +7,11 @@
7
7
 
8
8
  #include "alloc.h"
9
9
 
10
- #include "allocators/stdalloc.h"
11
- #include "allocators/win32_crtdbg.h"
10
+ #if defined(GIT_MSVC_CRTDBG)
11
+ # include "win32/w32_crtdbg_stacktrace.h"
12
+ #else
13
+ # include "stdalloc.h"
14
+ #endif
12
15
 
13
16
  git_allocator git__allocator;
14
17
 
@@ -41,3 +44,12 @@ int git_allocator_setup(git_allocator *allocator)
41
44
  memcpy(&git__allocator, allocator, sizeof(*allocator));
42
45
  return 0;
43
46
  }
47
+
48
+ #if !defined(GIT_MSVC_CRTDBG)
49
+ int git_win32_crtdbg_init_allocator(git_allocator *allocator)
50
+ {
51
+ GIT_UNUSED(allocator);
52
+ git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
53
+ return -1;
54
+ }
55
+ #endif
@@ -7,6 +7,8 @@
7
7
 
8
8
  #include "apply.h"
9
9
 
10
+ #include <assert.h>
11
+
10
12
  #include "git2/apply.h"
11
13
  #include "git2/patch.h"
12
14
  #include "git2/filter.h"
@@ -16,12 +18,15 @@
16
18
  #include "git2/repository.h"
17
19
  #include "array.h"
18
20
  #include "patch.h"
19
- #include "futils.h"
21
+ #include "fileops.h"
20
22
  #include "delta.h"
21
23
  #include "zstream.h"
22
24
  #include "reader.h"
23
25
  #include "index.h"
24
26
 
27
+ #define apply_err(...) \
28
+ ( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), GIT_EAPPLYFAIL )
29
+
25
30
  typedef struct {
26
31
  /* The lines that we allocate ourself are allocated out of the pool.
27
32
  * (Lines may have been allocated out of the diff.)
@@ -30,18 +35,6 @@ typedef struct {
30
35
  git_vector lines;
31
36
  } patch_image;
32
37
 
33
- static int apply_err(const char *fmt, ...) GIT_FORMAT_PRINTF(1, 2);
34
- static int apply_err(const char *fmt, ...)
35
- {
36
- va_list ap;
37
-
38
- va_start(ap, fmt);
39
- git_error_vset(GIT_ERROR_PATCH, fmt, ap);
40
- va_end(ap);
41
-
42
- return GIT_EAPPLYFAIL;
43
- }
44
-
45
38
  static void patch_line_init(
46
39
  git_diff_line *out,
47
40
  const char *in,
@@ -66,7 +59,7 @@ static int patch_image_init_fromstr(
66
59
  git_pool_init(&out->pool, sizeof(git_diff_line));
67
60
 
68
61
  for (start = in; start < in + in_len; start = end) {
69
- end = memchr(start, '\n', in_len - (start - in));
62
+ end = memchr(start, '\n', in_len);
70
63
 
71
64
  if (end == NULL)
72
65
  end = in + in_len;
@@ -206,34 +199,23 @@ static int apply_hunk(
206
199
 
207
200
  for (i = 0; i < hunk->line_count; i++) {
208
201
  size_t linenum = hunk->line_start + i;
209
- git_diff_line *line = git_array_get(patch->lines, linenum), *prev;
202
+ git_diff_line *line = git_array_get(patch->lines, linenum);
210
203
 
211
204
  if (!line) {
212
205
  error = apply_err("preimage does not contain line %"PRIuZ, linenum);
213
206
  goto done;
214
207
  }
215
208
 
216
- switch (line->origin) {
217
- case GIT_DIFF_LINE_CONTEXT_EOFNL:
218
- case GIT_DIFF_LINE_DEL_EOFNL:
219
- case GIT_DIFF_LINE_ADD_EOFNL:
220
- prev = i ? git_array_get(patch->lines, linenum - 1) : NULL;
221
- if (prev && prev->content[prev->content_len - 1] == '\n')
222
- prev->content_len -= 1;
223
- break;
224
- case GIT_DIFF_LINE_CONTEXT:
225
- if ((error = git_vector_insert(&preimage.lines, line)) < 0 ||
226
- (error = git_vector_insert(&postimage.lines, line)) < 0)
227
- goto done;
228
- break;
229
- case GIT_DIFF_LINE_DELETION:
230
- if ((error = git_vector_insert(&preimage.lines, line)) < 0)
231
- goto done;
232
- break;
233
- case GIT_DIFF_LINE_ADDITION:
234
- if ((error = git_vector_insert(&postimage.lines, line)) < 0)
235
- goto done;
236
- break;
209
+ if (line->origin == GIT_DIFF_LINE_CONTEXT ||
210
+ line->origin == GIT_DIFF_LINE_DELETION) {
211
+ if ((error = git_vector_insert(&preimage.lines, line)) < 0)
212
+ goto done;
213
+ }
214
+
215
+ if (line->origin == GIT_DIFF_LINE_CONTEXT ||
216
+ line->origin == GIT_DIFF_LINE_ADDITION) {
217
+ if ((error = git_vector_insert(&postimage.lines, line)) < 0)
218
+ goto done;
237
219
  }
238
220
  }
239
221
 
@@ -457,6 +439,7 @@ static int apply_one(
457
439
  git_filemode_t pre_filemode;
458
440
  git_index_entry pre_entry, post_entry;
459
441
  bool skip_preimage = false;
442
+ size_t pos;
460
443
  int error;
461
444
 
462
445
  if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
@@ -481,7 +464,8 @@ static int apply_one(
481
464
  */
482
465
  if (delta->status != GIT_DELTA_RENAMED &&
483
466
  delta->status != GIT_DELTA_ADDED) {
484
- if (git_strmap_exists(removed_paths, delta->old_file.path)) {
467
+ pos = git_strmap_lookup_index(removed_paths, delta->old_file.path);
468
+ if (git_strmap_valid_index(removed_paths, pos)) {
485
469
  error = apply_err("path '%s' has been renamed or deleted", delta->old_file.path);
486
470
  goto done;
487
471
  }
@@ -550,7 +534,7 @@ static int apply_one(
550
534
  if (delta->status != GIT_DELTA_DELETED) {
551
535
  if ((error = git_apply__patch(&post_contents, &filename, &mode,
552
536
  pre_contents.ptr, pre_contents.size, patch, opts)) < 0 ||
553
- (error = git_blob_create_from_buffer(&post_id, repo,
537
+ (error = git_blob_create_frombuffer(&post_id, repo,
554
538
  post_contents.ptr, post_contents.size)) < 0)
555
539
  goto done;
556
540
 
@@ -565,7 +549,7 @@ static int apply_one(
565
549
 
566
550
  if (delta->status == GIT_DELTA_RENAMED ||
567
551
  delta->status == GIT_DELTA_DELETED)
568
- error = git_strmap_set(removed_paths, delta->old_file.path, (char *) delta->old_file.path);
552
+ git_strmap_insert(removed_paths, delta->old_file.path, (char *)delta->old_file.path, &error);
569
553
 
570
554
  if (delta->status == GIT_DELTA_RENAMED ||
571
555
  delta->status == GIT_DELTA_ADDED)
@@ -593,7 +577,7 @@ static int apply_deltas(
593
577
  size_t i;
594
578
  int error = 0;
595
579
 
596
- if (git_strmap_new(&removed_paths) < 0)
580
+ if (git_strmap_alloc(&removed_paths) < 0)
597
581
  return -1;
598
582
 
599
583
  for (i = 0; i < git_diff_num_deltas(diff); i++) {
@@ -647,12 +631,9 @@ int git_apply_to_tree(
647
631
  for (i = 0; i < git_diff_num_deltas(diff); i++) {
648
632
  delta = git_diff_get_delta(diff, i);
649
633
 
650
- if (delta->status == GIT_DELTA_DELETED ||
651
- delta->status == GIT_DELTA_RENAMED) {
652
- if ((error = git_index_remove(postimage,
653
- delta->old_file.path, 0)) < 0)
654
- goto done;
655
- }
634
+ if ((error = git_index_remove(postimage,
635
+ delta->old_file.path, 0)) < 0)
636
+ goto done;
656
637
  }
657
638
 
658
639
  if ((error = apply_deltas(repo, pre_reader, NULL, post_reader, postimage, diff, &opts)) < 0)
@@ -766,13 +747,6 @@ done:
766
747
  return error;
767
748
  }
768
749
 
769
- int git_apply_options_init(git_apply_options *opts, unsigned int version)
770
- {
771
- GIT_INIT_STRUCTURE_FROM_TEMPLATE(
772
- opts, version, git_apply_options, GIT_APPLY_OPTIONS_INIT);
773
- return 0;
774
- }
775
-
776
750
  /*
777
751
  * Handle the three application options ("locations"):
778
752
  *
@@ -843,15 +817,11 @@ int git_apply(
843
817
  (error = git_reader_for_index(&post_reader, repo, postimage)) < 0)
844
818
  goto done;
845
819
 
846
- if (!(opts.flags & GIT_APPLY_CHECK))
847
- if ((error = git_repository_index(&index, repo)) < 0 ||
848
- (error = git_indexwriter_init(&indexwriter, index)) < 0)
849
- goto done;
850
-
851
- if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
820
+ if ((error = git_repository_index(&index, repo)) < 0 ||
821
+ (error = git_indexwriter_init(&indexwriter, index)) < 0)
852
822
  goto done;
853
823
 
854
- if ((opts.flags & GIT_APPLY_CHECK))
824
+ if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
855
825
  goto done;
856
826
 
857
827
  switch (location) {
@@ -19,18 +19,18 @@ const char *git_attr__true = "[internal]__TRUE__";
19
19
  const char *git_attr__false = "[internal]__FALSE__";
20
20
  const char *git_attr__unset = "[internal]__UNSET__";
21
21
 
22
- git_attr_value_t git_attr_value(const char *attr)
22
+ git_attr_t git_attr_value(const char *attr)
23
23
  {
24
24
  if (attr == NULL || attr == git_attr__unset)
25
- return GIT_ATTR_VALUE_UNSPECIFIED;
25
+ return GIT_ATTR_UNSPECIFIED_T;
26
26
 
27
27
  if (attr == git_attr__true)
28
- return GIT_ATTR_VALUE_TRUE;
28
+ return GIT_ATTR_TRUE_T;
29
29
 
30
30
  if (attr == git_attr__false)
31
- return GIT_ATTR_VALUE_FALSE;
31
+ return GIT_ATTR_FALSE_T;
32
32
 
33
- return GIT_ATTR_VALUE_STRING;
33
+ return GIT_ATTR_VALUE_T;
34
34
  }
35
35
 
36
36
  static int collect_attr_files(
@@ -215,7 +215,7 @@ int git_attr_foreach(
215
215
  return -1;
216
216
 
217
217
  if ((error = collect_attr_files(repo, NULL, flags, pathname, &files)) < 0 ||
218
- (error = git_strmap_new(&seen)) < 0)
218
+ (error = git_strmap_alloc(&seen)) < 0)
219
219
  goto cleanup;
220
220
 
221
221
  git_vector_foreach(&files, i, file) {
@@ -227,7 +227,8 @@ int git_attr_foreach(
227
227
  if (git_strmap_exists(seen, assign->name))
228
228
  continue;
229
229
 
230
- if ((error = git_strmap_set(seen, assign->name, assign)) < 0)
230
+ git_strmap_insert(seen, assign->name, assign, &error);
231
+ if (error < 0)
231
232
  goto cleanup;
232
233
 
233
234
  error = callback(assign->name, assign->value, payload);
@@ -252,16 +253,15 @@ static int preload_attr_file(
252
253
  git_attr_session *attr_session,
253
254
  git_attr_file_source source,
254
255
  const char *base,
255
- const char *file,
256
- bool allow_macros)
256
+ const char *file)
257
257
  {
258
258
  int error;
259
259
  git_attr_file *preload = NULL;
260
260
 
261
261
  if (!file)
262
262
  return 0;
263
- if (!(error = git_attr_cache__get(&preload, repo, attr_session, source, base, file,
264
- git_attr_file__parse_buffer, allow_macros)))
263
+ if (!(error = git_attr_cache__get(
264
+ &preload, repo, attr_session, source, base, file, git_attr_file__parse_buffer)))
265
265
  git_attr_file__free(preload);
266
266
 
267
267
  return error;
@@ -305,15 +305,12 @@ static int system_attr_file(
305
305
  return 0;
306
306
  }
307
307
 
308
- static int attr_setup(
309
- git_repository *repo,
310
- git_attr_session *attr_session,
311
- uint32_t flags)
308
+ static int attr_setup(git_repository *repo, git_attr_session *attr_session)
312
309
  {
313
- git_buf path = GIT_BUF_INIT;
314
- git_index *idx = NULL;
315
- const char *workdir;
316
310
  int error = 0;
311
+ const char *workdir = git_repository_workdir(repo);
312
+ git_index *idx = NULL;
313
+ git_buf path = GIT_BUF_INIT;
317
314
 
318
315
  if (attr_session && attr_session->init_setup)
319
316
  return 0;
@@ -321,43 +318,41 @@ static int attr_setup(
321
318
  if ((error = git_attr_cache__init(repo)) < 0)
322
319
  return error;
323
320
 
324
- /*
325
- * Preload attribute files that could contain macros so the
326
- * definitions will be available for later file parsing.
321
+ /* preload attribute files that could contain macros so the
322
+ * definitions will be available for later file parsing
327
323
  */
328
324
 
329
- if ((error = system_attr_file(&path, attr_session)) < 0 ||
330
- (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
331
- NULL, path.ptr, true)) < 0) {
332
- if (error != GIT_ENOTFOUND)
333
- goto out;
334
- }
325
+ error = system_attr_file(&path, attr_session);
335
326
 
336
- if ((error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
337
- NULL, git_repository_attr_cache(repo)->cfg_attr_file, true)) < 0)
327
+ if (error == 0)
328
+ error = preload_attr_file(
329
+ repo, attr_session, GIT_ATTR_FILE__FROM_FILE, NULL, path.ptr);
330
+
331
+ if (error != GIT_ENOTFOUND)
338
332
  goto out;
339
333
 
340
- git_buf_clear(&path); /* git_repository_item_path expects an empty buffer, because it uses git_buf_set */
341
- if ((error = git_repository_item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
342
- (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
343
- path.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
344
- if (error != GIT_ENOTFOUND)
345
- goto out;
346
- }
334
+ if ((error = preload_attr_file(
335
+ repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
336
+ NULL, git_repository_attr_cache(repo)->cfg_attr_file)) < 0)
337
+ goto out;
347
338
 
348
- if ((workdir = git_repository_workdir(repo)) != NULL &&
349
- (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
350
- workdir, GIT_ATTR_FILE, true)) < 0)
351
- goto out;
339
+ if ((error = git_repository_item_path(&path,
340
+ repo, GIT_REPOSITORY_ITEM_INFO)) < 0)
341
+ goto out;
352
342
 
353
- if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
354
- (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_INDEX,
355
- NULL, GIT_ATTR_FILE, true)) < 0)
356
- goto out;
343
+ if ((error = preload_attr_file(
344
+ repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
345
+ path.ptr, GIT_ATTR_FILE_INREPO)) < 0)
346
+ goto out;
347
+
348
+ if (workdir != NULL &&
349
+ (error = preload_attr_file(
350
+ repo, attr_session, GIT_ATTR_FILE__FROM_FILE, workdir, GIT_ATTR_FILE)) < 0)
351
+ goto out;
357
352
 
358
- if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0 &&
359
- (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_HEAD,
360
- NULL, GIT_ATTR_FILE, true)) < 0)
353
+ if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
354
+ (error = preload_attr_file(
355
+ repo, attr_session, GIT_ATTR_FILE__FROM_INDEX, NULL, GIT_ATTR_FILE)) < 0)
361
356
  goto out;
362
357
 
363
358
  if (attr_session)
@@ -436,9 +431,6 @@ static int attr_decide_sources(
436
431
  break;
437
432
  }
438
433
 
439
- if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0)
440
- srcs[count++] = GIT_ATTR_FILE__FROM_HEAD;
441
-
442
434
  return count;
443
435
  }
444
436
 
@@ -448,14 +440,13 @@ static int push_attr_file(
448
440
  git_vector *list,
449
441
  git_attr_file_source source,
450
442
  const char *base,
451
- const char *filename,
452
- bool allow_macros)
443
+ const char *filename)
453
444
  {
454
445
  int error = 0;
455
446
  git_attr_file *file = NULL;
456
447
 
457
448
  error = git_attr_cache__get(&file, repo, attr_session,
458
- source, base, filename, git_attr_file__parse_buffer, allow_macros);
449
+ source, base, filename, git_attr_file__parse_buffer);
459
450
 
460
451
  if (error < 0)
461
452
  return error;
@@ -470,18 +461,16 @@ static int push_attr_file(
470
461
 
471
462
  static int push_one_attr(void *ref, const char *path)
472
463
  {
473
- attr_walk_up_info *info = (attr_walk_up_info *)ref;
474
- git_attr_file_source src[GIT_ATTR_FILE_NUM_SOURCES];
475
464
  int error = 0, n_src, i;
476
- bool allow_macros;
465
+ attr_walk_up_info *info = (attr_walk_up_info *)ref;
466
+ git_attr_file_source src[2];
477
467
 
478
468
  n_src = attr_decide_sources(
479
469
  info->flags, info->workdir != NULL, info->index != NULL, src);
480
- allow_macros = info->workdir ? !strcmp(info->workdir, path) : false;
481
470
 
482
471
  for (i = 0; !error && i < n_src; ++i)
483
- error = push_attr_file(info->repo, info->attr_session, info->files,
484
- src[i], path, GIT_ATTR_FILE, allow_macros);
472
+ error = push_attr_file(info->repo, info->attr_session,
473
+ info->files, src[i], path, GIT_ATTR_FILE);
485
474
 
486
475
  return error;
487
476
  }
@@ -510,7 +499,7 @@ static int collect_attr_files(
510
499
  const char *workdir = git_repository_workdir(repo);
511
500
  attr_walk_up_info info = { NULL };
512
501
 
513
- if ((error = attr_setup(repo, attr_session, flags)) < 0)
502
+ if ((error = attr_setup(repo, attr_session)) < 0)
514
503
  return error;
515
504
 
516
505
  /* Resolve path in a non-bare repo */
@@ -528,12 +517,15 @@ static int collect_attr_files(
528
517
  * - $GIT_PREFIX/etc/gitattributes
529
518
  */
530
519
 
531
- if ((error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
532
- (error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
533
- attrfile.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
534
- if (error != GIT_ENOTFOUND)
535
- goto cleanup;
536
- }
520
+ error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO);
521
+ if (error < 0)
522
+ goto cleanup;
523
+
524
+ error = push_attr_file(
525
+ repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
526
+ attrfile.ptr, GIT_ATTR_FILE_INREPO);
527
+ if (error < 0)
528
+ goto cleanup;
537
529
 
538
530
  info.repo = repo;
539
531
  info.attr_session = attr_session;
@@ -552,8 +544,9 @@ static int collect_attr_files(
552
544
  goto cleanup;
553
545
 
554
546
  if (git_repository_attr_cache(repo)->cfg_attr_file != NULL) {
555
- error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
556
- NULL, git_repository_attr_cache(repo)->cfg_attr_file, true);
547
+ error = push_attr_file(
548
+ repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
549
+ NULL, git_repository_attr_cache(repo)->cfg_attr_file);
557
550
  if (error < 0)
558
551
  goto cleanup;
559
552
  }
@@ -562,8 +555,9 @@ static int collect_attr_files(
562
555
  error = system_attr_file(&dir, attr_session);
563
556
 
564
557
  if (!error)
565
- error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
566
- NULL, dir.ptr, true);
558
+ error = push_attr_file(
559
+ repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
560
+ NULL, dir.ptr);
567
561
  else if (error == GIT_ENOTFOUND)
568
562
  error = 0;
569
563
  }