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
@@ -50,24 +50,4 @@ struct git_revwalk {
50
50
 
51
51
  git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);
52
52
 
53
- typedef struct {
54
- int uninteresting;
55
- int from_glob;
56
- int insert_by_date;
57
- } git_revwalk__push_options;
58
-
59
- #define GIT_REVWALK__PUSH_OPTIONS_INIT { 0 }
60
-
61
- int git_revwalk__push_commit(git_revwalk *walk,
62
- const git_oid *oid,
63
- const git_revwalk__push_options *opts);
64
-
65
- int git_revwalk__push_ref(git_revwalk *walk,
66
- const char *refname,
67
- const git_revwalk__push_options *opts);
68
-
69
- int git_revwalk__push_glob(git_revwalk *walk,
70
- const char *glob,
71
- const git_revwalk__push_options *given_opts);
72
-
73
53
  #endif
@@ -57,7 +57,6 @@ int git_libgit2_features(void)
57
57
  extern size_t git_mwindow__window_size;
58
58
  extern size_t git_mwindow__mapped_limit;
59
59
  extern size_t git_indexer__max_objects;
60
- extern bool git_disable_pack_keep_file_checks;
61
60
 
62
61
  static int config_level_to_sysdir(int config_level)
63
62
  {
@@ -280,10 +279,6 @@ int git_libgit2_opts(int key, ...)
280
279
  *(va_arg(ap, size_t *)) = git_indexer__max_objects;
281
280
  break;
282
281
 
283
- case GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS:
284
- git_disable_pack_keep_file_checks = (va_arg(ap, int) != 0);
285
- break;
286
-
287
282
  default:
288
283
  git_error_set(GIT_ERROR_INVALID, "invalid option key");
289
284
  error = -1;
@@ -28,7 +28,7 @@ int git_sortedcache_new(
28
28
  git_pool_init(&sc->pool, 1);
29
29
 
30
30
  if (git_vector_init(&sc->items, 4, item_cmp) < 0 ||
31
- git_strmap_new(&sc->map) < 0)
31
+ git_strmap_alloc(&sc->map) < 0)
32
32
  goto fail;
33
33
 
34
34
  if (git_rwlock_init(&sc->lock)) {
@@ -270,19 +270,23 @@ int git_sortedcache_clear(git_sortedcache *sc, bool wlock)
270
270
  /* find and/or insert item, returning pointer to item data */
271
271
  int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
272
272
  {
273
- size_t keylen, itemlen;
273
+ size_t pos;
274
274
  int error = 0;
275
- char *item_key;
276
275
  void *item;
276
+ size_t keylen, itemlen;
277
+ char *item_key;
277
278
 
278
- if ((item = git_strmap_get(sc->map, key)) != NULL)
279
+ pos = git_strmap_lookup_index(sc->map, key);
280
+ if (git_strmap_valid_index(sc->map, pos)) {
281
+ item = git_strmap_value_at(sc->map, pos);
279
282
  goto done;
283
+ }
280
284
 
281
285
  keylen = strlen(key);
282
286
  itemlen = sc->item_path_offset + keylen + 1;
283
287
  itemlen = (itemlen + 7) & ~7;
284
288
 
285
- if ((item = git_pool_mallocz(&sc->pool, itemlen)) == NULL) {
289
+ if ((item = git_pool_mallocz(&sc->pool, (uint32_t)itemlen)) == NULL) {
286
290
  /* don't use GIT_ERROR_CHECK_ALLOC b/c of lock */
287
291
  error = -1;
288
292
  goto done;
@@ -295,11 +299,17 @@ int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
295
299
  item_key = ((char *)item) + sc->item_path_offset;
296
300
  memcpy(item_key, key, keylen);
297
301
 
298
- if ((error = git_strmap_set(sc->map, item_key, item)) < 0)
302
+ pos = git_strmap_put(sc->map, item_key, &error);
303
+ if (error < 0)
299
304
  goto done;
300
305
 
301
- if ((error = git_vector_insert(&sc->items, item)) < 0)
302
- git_strmap_delete(sc->map, item_key);
306
+ if (!error)
307
+ git_strmap_set_key_at(sc->map, pos, item_key);
308
+ git_strmap_set_value_at(sc->map, pos, item);
309
+
310
+ error = git_vector_insert(&sc->items, item);
311
+ if (error < 0)
312
+ git_strmap_delete_at(sc->map, pos);
303
313
 
304
314
  done:
305
315
  if (out)
@@ -310,7 +320,10 @@ done:
310
320
  /* lookup item by key */
311
321
  void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key)
312
322
  {
313
- return git_strmap_get(sc->map, key);
323
+ size_t pos = git_strmap_lookup_index(sc->map, key);
324
+ if (git_strmap_valid_index(sc->map, pos))
325
+ return git_strmap_value_at(sc->map, pos);
326
+ return NULL;
314
327
  }
315
328
 
316
329
  /* find out how many items are in the cache */
@@ -358,9 +371,9 @@ int git_sortedcache_lookup_index(
358
371
  int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
359
372
  {
360
373
  char *item;
374
+ size_t mappos;
361
375
 
362
- /*
363
- * Because of pool allocation, this can't actually remove the item,
376
+ /* because of pool allocation, this can't actually remove the item,
364
377
  * but we can remove it from the items vector and the hash table.
365
378
  */
366
379
 
@@ -371,7 +384,8 @@ int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
371
384
 
372
385
  (void)git_vector_remove(&sc->items, pos);
373
386
 
374
- git_strmap_delete(sc->map, item + sc->item_path_offset);
387
+ mappos = git_strmap_lookup_index(sc->map, item + sc->item_path_offset);
388
+ git_strmap_delete_at(sc->map, mappos);
375
389
 
376
390
  if (sc->free_item)
377
391
  sc->free_item(sc->free_item_payload, item);
@@ -10,7 +10,7 @@
10
10
  #include "common.h"
11
11
 
12
12
  #include "util.h"
13
- #include "futils.h"
13
+ #include "fileops.h"
14
14
  #include "vector.h"
15
15
  #include "thread-utils.h"
16
16
  #include "pool.h"
@@ -398,23 +398,28 @@ static int commit_worktree(
398
398
  git_commit *b_commit,
399
399
  git_commit *u_commit)
400
400
  {
401
- const git_commit *parents[] = { NULL, NULL, NULL };
402
- git_index *i_index = NULL, *r_index = NULL;
403
- git_tree *w_tree = NULL;
404
- int error = 0, ignorecase;
401
+ int error = 0;
402
+ git_tree *w_tree = NULL, *i_tree = NULL;
403
+ git_index *i_index = NULL;
404
+ const git_commit *parents[] = { NULL, NULL, NULL };
405
+ int ignorecase;
405
406
 
406
407
  parents[0] = b_commit;
407
408
  parents[1] = i_commit;
408
409
  parents[2] = u_commit;
409
410
 
410
- if ((error = git_repository_index(&r_index, repo) < 0) ||
411
- (error = git_index_new(&i_index)) < 0 ||
412
- (error = git_index__fill(i_index, &r_index->entries) < 0) ||
413
- (error = git_repository__configmap_lookup(&ignorecase, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
411
+ if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
412
+ goto cleanup;
413
+
414
+ if ((error = git_index_new(&i_index)) < 0 ||
415
+ (error = git_repository__cvar(&ignorecase, repo, GIT_CVAR_IGNORECASE)) < 0)
414
416
  goto cleanup;
415
417
 
416
418
  git_index__set_ignore_case(i_index, ignorecase);
417
419
 
420
+ if ((error = git_index_read_tree(i_index, i_tree)) < 0)
421
+ goto cleanup;
422
+
418
423
  if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
419
424
  goto cleanup;
420
425
 
@@ -431,39 +436,42 @@ static int commit_worktree(
431
436
  parents);
432
437
 
433
438
  cleanup:
439
+ git_tree_free(i_tree);
434
440
  git_tree_free(w_tree);
435
441
  git_index_free(i_index);
436
- git_index_free(r_index);
437
442
  return error;
438
443
  }
439
444
 
440
- static int prepare_worktree_commit_message(git_buf *out, const char *user_message)
445
+ static int prepare_worktree_commit_message(
446
+ git_buf* msg,
447
+ const char *user_message)
441
448
  {
442
449
  git_buf buf = GIT_BUF_INIT;
443
- int error = 0;
450
+ int error;
444
451
 
445
- if (!user_message) {
446
- git_buf_printf(&buf, "WIP on %s", git_buf_cstr(out));
447
- } else {
452
+ if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0)
453
+ return error;
454
+
455
+ git_buf_clear(msg);
456
+
457
+ if (!user_message)
458
+ git_buf_printf(msg, "WIP on %s", git_buf_cstr(&buf));
459
+ else {
448
460
  const char *colon;
449
461
 
450
- if ((colon = strchr(git_buf_cstr(out), ':')) == NULL)
462
+ if ((colon = strchr(git_buf_cstr(&buf), ':')) == NULL)
451
463
  goto cleanup;
452
464
 
453
- git_buf_puts(&buf, "On ");
454
- git_buf_put(&buf, git_buf_cstr(out), colon - out->ptr);
455
- git_buf_printf(&buf, ": %s\n", user_message);
465
+ git_buf_puts(msg, "On ");
466
+ git_buf_put(msg, git_buf_cstr(&buf), colon - buf.ptr);
467
+ git_buf_printf(msg, ": %s\n", user_message);
456
468
  }
457
469
 
458
- if (git_buf_oom(&buf)) {
459
- error = -1;
460
- goto cleanup;
461
- }
462
-
463
- git_buf_swap(out, &buf);
470
+ error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
464
471
 
465
472
  cleanup:
466
473
  git_buf_dispose(&buf);
474
+
467
475
  return error;
468
476
  }
469
477
 
@@ -494,7 +502,10 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
494
502
  return GIT_PASSTHROUGH;
495
503
  }
496
504
 
497
- static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flags)
505
+ static int ensure_there_are_changes_to_stash(
506
+ git_repository *repo,
507
+ bool include_untracked_files,
508
+ bool include_ignored_files)
498
509
  {
499
510
  int error;
500
511
  git_status_options opts = GIT_STATUS_OPTIONS_INIT;
@@ -502,11 +513,11 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
502
513
  opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
503
514
  opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
504
515
 
505
- if (flags & GIT_STASH_INCLUDE_UNTRACKED)
516
+ if (include_untracked_files)
506
517
  opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
507
518
  GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
508
519
 
509
- if (flags & GIT_STASH_INCLUDE_IGNORED)
520
+ if (include_ignored_files)
510
521
  opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
511
522
  GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
512
523
 
@@ -521,14 +532,20 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
521
532
  return error;
522
533
  }
523
534
 
524
- static int reset_index_and_workdir(git_repository *repo, git_commit *commit, uint32_t flags)
535
+ static int reset_index_and_workdir(
536
+ git_repository *repo,
537
+ git_commit *commit,
538
+ bool remove_untracked,
539
+ bool remove_ignored)
525
540
  {
526
541
  git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
527
542
 
528
543
  opts.checkout_strategy = GIT_CHECKOUT_FORCE;
529
- if (flags & GIT_STASH_INCLUDE_UNTRACKED)
544
+
545
+ if (remove_untracked)
530
546
  opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
531
- if (flags & GIT_STASH_INCLUDE_IGNORED)
547
+
548
+ if (remove_ignored)
532
549
  opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
533
550
 
534
551
  return git_checkout_tree(repo, (git_object *)commit, &opts);
@@ -554,26 +571,31 @@ int git_stash_save(
554
571
  if ((error = retrieve_base_commit_and_message(&b_commit, &msg, repo)) < 0)
555
572
  goto cleanup;
556
573
 
557
- if ((error = ensure_there_are_changes_to_stash(repo, flags)) < 0)
574
+ if ((error = ensure_there_are_changes_to_stash(
575
+ repo,
576
+ (flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
577
+ (flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
558
578
  goto cleanup;
559
579
 
560
580
  if ((error = git_repository_index(&index, repo)) < 0)
561
581
  goto cleanup;
562
582
 
563
- if ((error = commit_index(&i_commit, repo, index, stasher,
564
- git_buf_cstr(&msg), b_commit)) < 0)
583
+ if ((error = commit_index(
584
+ &i_commit, repo, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
565
585
  goto cleanup;
566
586
 
567
587
  if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
568
- (error = commit_untracked(&u_commit, repo, stasher,
569
- git_buf_cstr(&msg), i_commit, flags)) < 0)
588
+ (error = commit_untracked(
589
+ &u_commit, repo, stasher, git_buf_cstr(&msg),
590
+ i_commit, flags)) < 0)
570
591
  goto cleanup;
571
592
 
572
593
  if ((error = prepare_worktree_commit_message(&msg, message)) < 0)
573
594
  goto cleanup;
574
595
 
575
- if ((error = commit_worktree(out, repo, stasher, git_buf_cstr(&msg),
576
- i_commit, b_commit, u_commit)) < 0)
596
+ if ((error = commit_worktree(
597
+ out, repo, stasher, git_buf_cstr(&msg),
598
+ i_commit, b_commit, u_commit)) < 0)
577
599
  goto cleanup;
578
600
 
579
601
  git_buf_rtrim(&msg);
@@ -581,8 +603,11 @@ int git_stash_save(
581
603
  if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
582
604
  goto cleanup;
583
605
 
584
- if ((error = reset_index_and_workdir(repo, (flags & GIT_STASH_KEEP_INDEX) ? i_commit : b_commit,
585
- flags)) < 0)
606
+ if ((error = reset_index_and_workdir(
607
+ repo,
608
+ ((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
609
+ (flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
610
+ (flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
586
611
  goto cleanup;
587
612
 
588
613
  cleanup:
@@ -769,18 +794,13 @@ static void normalize_apply_options(
769
794
  opts->checkout_options.their_label = "Stashed changes";
770
795
  }
771
796
 
772
- int git_stash_apply_options_init(git_stash_apply_options *opts, unsigned int version)
797
+ int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
773
798
  {
774
799
  GIT_INIT_STRUCTURE_FROM_TEMPLATE(
775
800
  opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT);
776
801
  return 0;
777
802
  }
778
803
 
779
- int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
780
- {
781
- return git_stash_apply_options_init(opts, version);
782
- }
783
-
784
804
  #define NOTIFY_PROGRESS(opts, progress_type) \
785
805
  do { \
786
806
  if ((opts).progress_cb && \
@@ -8,7 +8,7 @@
8
8
  #include "status.h"
9
9
 
10
10
  #include "git2.h"
11
- #include "futils.h"
11
+ #include "fileops.h"
12
12
  #include "hash.h"
13
13
  #include "vector.h"
14
14
  #include "tree.h"
@@ -16,7 +16,6 @@
16
16
  #include "repository.h"
17
17
  #include "ignore.h"
18
18
  #include "index.h"
19
- #include "wildmatch.h"
20
19
 
21
20
  #include "git2/diff.h"
22
21
  #include "diff.h"
@@ -86,14 +85,14 @@ static unsigned int workdir_delta2status(
86
85
  /* if OIDs don't match, we might need to calculate them now to
87
86
  * discern between RENAMED vs RENAMED+MODIFED
88
87
  */
89
- if (git_oid_is_zero(&idx2wd->old_file.id) &&
88
+ if (git_oid_iszero(&idx2wd->old_file.id) &&
90
89
  diff->old_src == GIT_ITERATOR_TYPE_WORKDIR &&
91
90
  !git_diff__oid_for_file(
92
91
  &idx2wd->old_file.id, diff, idx2wd->old_file.path,
93
92
  idx2wd->old_file.mode, idx2wd->old_file.size))
94
93
  idx2wd->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
95
94
 
96
- if (git_oid_is_zero(&idx2wd->new_file.id) &&
95
+ if (git_oid_iszero(&idx2wd->new_file.id) &&
97
96
  diff->new_src == GIT_ITERATOR_TYPE_WORKDIR &&
98
97
  !git_diff__oid_for_file(
99
98
  &idx2wd->new_file.id, diff, idx2wd->new_file.path,
@@ -281,7 +280,7 @@ int git_status_list_new(
281
280
  if ((error = git_repository__ensure_not_bare(repo, "status")) < 0 ||
282
281
  (error = git_repository_index(&index, repo)) < 0)
283
282
  return error;
284
-
283
+
285
284
  if (opts != NULL && opts->baseline != NULL) {
286
285
  head = opts->baseline;
287
286
  } else {
@@ -457,7 +456,7 @@ struct status_file_info {
457
456
  char *expected;
458
457
  unsigned int count;
459
458
  unsigned int status;
460
- int wildmatch_flags;
459
+ int fnm_flags;
461
460
  int ambiguous;
462
461
  };
463
462
 
@@ -469,11 +468,11 @@ static int get_one_status(const char *path, unsigned int status, void *data)
469
468
  sfi->count++;
470
469
  sfi->status = status;
471
470
 
472
- strcomp = (sfi->wildmatch_flags & WM_CASEFOLD) ? git__strcasecmp : git__strcmp;
471
+ strcomp = (sfi->fnm_flags & FNM_CASEFOLD) ? git__strcasecmp : git__strcmp;
473
472
 
474
473
  if (sfi->count > 1 ||
475
474
  (strcomp(sfi->expected, path) != 0 &&
476
- wildmatch(sfi->expected, path, sfi->wildmatch_flags) != 0))
475
+ p_fnmatch(sfi->expected, path, sfi->fnm_flags) != 0))
477
476
  {
478
477
  sfi->ambiguous = true;
479
478
  return GIT_EAMBIGUOUS; /* git_error_set will be done by caller */
@@ -500,7 +499,7 @@ int git_status_file(
500
499
  if ((sfi.expected = git__strdup(path)) == NULL)
501
500
  return -1;
502
501
  if (index->ignore_case)
503
- sfi.wildmatch_flags = WM_CASEFOLD;
502
+ sfi.fnm_flags = FNM_CASEFOLD;
504
503
 
505
504
  opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
506
505
  opts.flags = GIT_STATUS_OPT_INCLUDE_IGNORED |
@@ -541,18 +540,13 @@ int git_status_should_ignore(
541
540
  return git_ignore_path_is_ignored(ignored, repo, path);
542
541
  }
543
542
 
544
- int git_status_options_init(git_status_options *opts, unsigned int version)
543
+ int git_status_init_options(git_status_options *opts, unsigned int version)
545
544
  {
546
545
  GIT_INIT_STRUCTURE_FROM_TEMPLATE(
547
546
  opts, version, git_status_options, GIT_STATUS_OPTIONS_INIT);
548
547
  return 0;
549
548
  }
550
549
 
551
- int git_status_init_options(git_status_options *opts, unsigned int version)
552
- {
553
- return git_status_options_init(opts, version);
554
- }
555
-
556
550
  int git_status_list_get_perfdata(
557
551
  git_diff_perfdata *out, const git_status_list *status)
558
552
  {