rugged 0.27.9 → 0.27.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (420) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rugged/version.rb +1 -1
  3. data/vendor/libgit2/AUTHORS +1 -0
  4. data/vendor/libgit2/CMakeLists.txt +98 -54
  5. data/vendor/libgit2/COPYING +28 -0
  6. data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +15 -1
  7. data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +9 -8
  8. data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
  9. data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
  10. data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
  11. data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
  12. data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
  13. data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
  14. data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
  15. data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
  16. data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
  17. data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
  18. data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
  19. data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
  20. data/vendor/libgit2/deps/http-parser/CMakeLists.txt +2 -0
  21. data/vendor/libgit2/deps/http-parser/{LICENSE-MIT → COPYING} +0 -0
  22. data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
  23. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
  24. data/vendor/libgit2/deps/ntlmclient/compat.h +33 -0
  25. data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
  26. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
  27. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
  28. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
  29. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
  30. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
  31. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
  32. data/vendor/libgit2/deps/ntlmclient/ntlm.c +1420 -0
  33. data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
  34. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
  35. data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
  36. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
  37. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
  38. data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
  39. data/vendor/libgit2/deps/ntlmclient/util.c +21 -0
  40. data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
  41. data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
  42. data/vendor/libgit2/deps/pcre/COPYING +5 -0
  43. data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
  44. data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
  45. data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
  46. data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
  47. data/vendor/libgit2/deps/pcre/config.h.in +57 -0
  48. data/vendor/libgit2/deps/pcre/pcre.h +641 -0
  49. data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
  50. data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
  51. data/vendor/libgit2/deps/pcre/pcre_compile.c +9800 -0
  52. data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
  53. data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
  54. data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
  55. data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
  56. data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
  57. data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
  58. data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
  59. data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
  60. data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
  61. data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
  62. data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
  63. data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
  64. data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
  65. data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
  66. data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
  67. data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
  68. data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
  69. data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
  70. data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
  71. data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
  72. data/vendor/libgit2/deps/pcre/pcreposix.c +421 -0
  73. data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
  74. data/vendor/libgit2/deps/pcre/ucp.h +224 -0
  75. data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
  76. data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
  77. data/vendor/libgit2/deps/zlib/CMakeLists.txt +1 -0
  78. data/vendor/libgit2/deps/zlib/COPYING +27 -0
  79. data/vendor/libgit2/deps/zlib/adler32.c +0 -7
  80. data/vendor/libgit2/deps/zlib/crc32.c +0 -7
  81. data/vendor/libgit2/include/git2.h +5 -0
  82. data/vendor/libgit2/include/git2/annotated_commit.h +9 -0
  83. data/vendor/libgit2/include/git2/apply.h +149 -0
  84. data/vendor/libgit2/include/git2/attr.h +38 -20
  85. data/vendor/libgit2/include/git2/blame.h +42 -25
  86. data/vendor/libgit2/include/git2/blob.h +45 -13
  87. data/vendor/libgit2/include/git2/branch.h +1 -1
  88. data/vendor/libgit2/include/git2/buffer.h +22 -16
  89. data/vendor/libgit2/include/git2/cert.h +135 -0
  90. data/vendor/libgit2/include/git2/checkout.h +65 -32
  91. data/vendor/libgit2/include/git2/cherrypick.h +9 -7
  92. data/vendor/libgit2/include/git2/clone.h +12 -10
  93. data/vendor/libgit2/include/git2/commit.h +53 -3
  94. data/vendor/libgit2/include/git2/common.h +60 -8
  95. data/vendor/libgit2/include/git2/config.h +30 -19
  96. data/vendor/libgit2/include/git2/cred.h +308 -0
  97. data/vendor/libgit2/include/git2/deprecated.h +493 -0
  98. data/vendor/libgit2/include/git2/describe.h +32 -9
  99. data/vendor/libgit2/include/git2/diff.h +208 -156
  100. data/vendor/libgit2/include/git2/errors.h +54 -46
  101. data/vendor/libgit2/include/git2/filter.h +8 -0
  102. data/vendor/libgit2/include/git2/ignore.h +2 -2
  103. data/vendor/libgit2/include/git2/index.h +74 -52
  104. data/vendor/libgit2/include/git2/indexer.h +76 -6
  105. data/vendor/libgit2/include/git2/mailmap.h +115 -0
  106. data/vendor/libgit2/include/git2/merge.h +35 -18
  107. data/vendor/libgit2/include/git2/net.h +0 -5
  108. data/vendor/libgit2/include/git2/notes.h +1 -1
  109. data/vendor/libgit2/include/git2/object.h +17 -29
  110. data/vendor/libgit2/include/git2/odb.h +12 -11
  111. data/vendor/libgit2/include/git2/odb_backend.h +10 -9
  112. data/vendor/libgit2/include/git2/oid.h +2 -2
  113. data/vendor/libgit2/include/git2/pack.h +14 -3
  114. data/vendor/libgit2/include/git2/proxy.h +14 -8
  115. data/vendor/libgit2/include/git2/rebase.h +53 -6
  116. data/vendor/libgit2/include/git2/refs.h +33 -15
  117. data/vendor/libgit2/include/git2/refspec.h +17 -0
  118. data/vendor/libgit2/include/git2/remote.h +123 -24
  119. data/vendor/libgit2/include/git2/repository.h +76 -39
  120. data/vendor/libgit2/include/git2/revert.h +6 -4
  121. data/vendor/libgit2/include/git2/revwalk.h +7 -7
  122. data/vendor/libgit2/include/git2/signature.h +2 -2
  123. data/vendor/libgit2/include/git2/stash.h +15 -12
  124. data/vendor/libgit2/include/git2/status.h +33 -20
  125. data/vendor/libgit2/include/git2/submodule.h +30 -12
  126. data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
  127. data/vendor/libgit2/include/git2/sys/commit.h +1 -1
  128. data/vendor/libgit2/include/git2/sys/config.h +13 -13
  129. data/vendor/libgit2/include/git2/sys/cred.h +90 -0
  130. data/vendor/libgit2/include/git2/sys/filter.h +6 -6
  131. data/vendor/libgit2/include/git2/sys/index.h +3 -0
  132. data/vendor/libgit2/include/git2/sys/mempack.h +35 -35
  133. data/vendor/libgit2/include/git2/sys/merge.h +9 -4
  134. data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -22
  135. data/vendor/libgit2/include/git2/sys/path.h +64 -0
  136. data/vendor/libgit2/include/git2/sys/refdb_backend.h +76 -40
  137. data/vendor/libgit2/include/git2/sys/repository.h +5 -1
  138. data/vendor/libgit2/include/git2/sys/stream.h +92 -12
  139. data/vendor/libgit2/include/git2/sys/transport.h +129 -83
  140. data/vendor/libgit2/include/git2/tag.h +13 -4
  141. data/vendor/libgit2/include/git2/trace.h +2 -2
  142. data/vendor/libgit2/include/git2/transaction.h +1 -0
  143. data/vendor/libgit2/include/git2/transport.h +11 -311
  144. data/vendor/libgit2/include/git2/tree.h +4 -4
  145. data/vendor/libgit2/include/git2/types.h +33 -111
  146. data/vendor/libgit2/include/git2/version.h +4 -4
  147. data/vendor/libgit2/include/git2/worktree.h +48 -13
  148. data/vendor/libgit2/src/CMakeLists.txt +96 -164
  149. data/vendor/libgit2/src/alloc.c +43 -0
  150. data/vendor/libgit2/src/alloc.h +40 -0
  151. data/vendor/libgit2/src/allocators/stdalloc.c +119 -0
  152. data/vendor/libgit2/src/{streams/curl.h → allocators/stdalloc.h} +5 -5
  153. data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
  154. data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
  155. data/vendor/libgit2/src/annotated_commit.c +15 -8
  156. data/vendor/libgit2/src/apply.c +537 -31
  157. data/vendor/libgit2/src/apply.h +3 -1
  158. data/vendor/libgit2/src/array.h +2 -2
  159. data/vendor/libgit2/src/attr.c +81 -75
  160. data/vendor/libgit2/src/attr_file.c +207 -121
  161. data/vendor/libgit2/src/attr_file.h +9 -9
  162. data/vendor/libgit2/src/attrcache.c +51 -53
  163. data/vendor/libgit2/src/attrcache.h +2 -1
  164. data/vendor/libgit2/src/blame.c +47 -20
  165. data/vendor/libgit2/src/blame.h +2 -1
  166. data/vendor/libgit2/src/blame_git.c +37 -20
  167. data/vendor/libgit2/src/blob.c +128 -42
  168. data/vendor/libgit2/src/blob.h +19 -2
  169. data/vendor/libgit2/src/branch.c +67 -43
  170. data/vendor/libgit2/src/buf_text.c +7 -6
  171. data/vendor/libgit2/src/buffer.c +69 -57
  172. data/vendor/libgit2/src/buffer.h +1 -1
  173. data/vendor/libgit2/src/cache.c +38 -45
  174. data/vendor/libgit2/src/cache.h +3 -3
  175. data/vendor/libgit2/src/cc-compat.h +20 -3
  176. data/vendor/libgit2/src/checkout.c +109 -90
  177. data/vendor/libgit2/src/cherrypick.c +15 -9
  178. data/vendor/libgit2/src/clone.c +49 -27
  179. data/vendor/libgit2/src/clone.h +4 -0
  180. data/vendor/libgit2/src/commit.c +117 -49
  181. data/vendor/libgit2/src/commit.h +7 -0
  182. data/vendor/libgit2/src/commit_list.c +30 -78
  183. data/vendor/libgit2/src/commit_list.h +2 -2
  184. data/vendor/libgit2/src/common.h +27 -91
  185. data/vendor/libgit2/src/config.c +194 -176
  186. data/vendor/libgit2/src/config.h +8 -20
  187. data/vendor/libgit2/src/config_backend.h +96 -0
  188. data/vendor/libgit2/src/config_cache.c +41 -35
  189. data/vendor/libgit2/src/config_entries.c +229 -0
  190. data/vendor/libgit2/src/config_entries.h +24 -0
  191. data/vendor/libgit2/src/config_file.c +439 -753
  192. data/vendor/libgit2/src/config_mem.c +220 -0
  193. data/vendor/libgit2/src/config_parse.c +114 -63
  194. data/vendor/libgit2/src/config_parse.h +17 -16
  195. data/vendor/libgit2/src/config_snapshot.c +206 -0
  196. data/vendor/libgit2/src/crlf.c +219 -190
  197. data/vendor/libgit2/src/delta.c +25 -18
  198. data/vendor/libgit2/src/describe.c +42 -41
  199. data/vendor/libgit2/src/diff.c +53 -68
  200. data/vendor/libgit2/src/diff.h +2 -1
  201. data/vendor/libgit2/src/diff_driver.c +47 -49
  202. data/vendor/libgit2/src/diff_file.c +19 -17
  203. data/vendor/libgit2/src/diff_file.h +1 -1
  204. data/vendor/libgit2/src/diff_generate.c +162 -106
  205. data/vendor/libgit2/src/diff_generate.h +3 -3
  206. data/vendor/libgit2/src/diff_parse.c +4 -4
  207. data/vendor/libgit2/src/diff_print.c +42 -30
  208. data/vendor/libgit2/src/diff_stats.c +22 -7
  209. data/vendor/libgit2/src/diff_tform.c +16 -16
  210. data/vendor/libgit2/src/diff_xdiff.c +15 -3
  211. data/vendor/libgit2/src/errors.c +51 -39
  212. data/vendor/libgit2/src/errors.h +81 -0
  213. data/vendor/libgit2/src/features.h.in +11 -3
  214. data/vendor/libgit2/src/fetch.c +10 -5
  215. data/vendor/libgit2/src/fetchhead.c +17 -17
  216. data/vendor/libgit2/src/filebuf.c +32 -36
  217. data/vendor/libgit2/src/filebuf.h +2 -2
  218. data/vendor/libgit2/src/filter.c +46 -38
  219. data/vendor/libgit2/src/filter.h +0 -10
  220. data/vendor/libgit2/src/{fileops.c → futils.c} +80 -73
  221. data/vendor/libgit2/src/{fileops.h → futils.h} +6 -6
  222. data/vendor/libgit2/src/global.c +48 -63
  223. data/vendor/libgit2/src/global.h +0 -2
  224. data/vendor/libgit2/src/hash.c +61 -0
  225. data/vendor/libgit2/src/hash.h +20 -19
  226. data/vendor/libgit2/src/hash/sha1.h +38 -0
  227. data/vendor/libgit2/src/hash/sha1/collisiondetect.c +48 -0
  228. data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
  229. data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +17 -17
  230. data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
  231. data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
  232. data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -10
  233. data/vendor/libgit2/src/hash/sha1/mbedtls.c +46 -0
  234. data/vendor/libgit2/src/hash/sha1/mbedtls.h +19 -0
  235. data/vendor/libgit2/src/hash/sha1/openssl.c +59 -0
  236. data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
  237. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
  238. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
  239. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
  240. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
  241. data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +47 -37
  242. data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
  243. data/vendor/libgit2/src/hashsig.c +5 -5
  244. data/vendor/libgit2/src/idxmap.c +107 -61
  245. data/vendor/libgit2/src/idxmap.h +153 -31
  246. data/vendor/libgit2/src/ignore.c +43 -47
  247. data/vendor/libgit2/src/index.c +337 -232
  248. data/vendor/libgit2/src/index.h +17 -1
  249. data/vendor/libgit2/src/indexer.c +346 -175
  250. data/vendor/libgit2/src/integer.h +71 -26
  251. data/vendor/libgit2/src/iterator.c +142 -70
  252. data/vendor/libgit2/src/iterator.h +15 -0
  253. data/vendor/libgit2/src/khash.h +3 -1
  254. data/vendor/libgit2/src/mailmap.c +485 -0
  255. data/vendor/libgit2/src/mailmap.h +35 -0
  256. data/vendor/libgit2/src/map.h +1 -1
  257. data/vendor/libgit2/src/merge.c +144 -100
  258. data/vendor/libgit2/src/merge_driver.c +11 -11
  259. data/vendor/libgit2/src/merge_file.c +2 -2
  260. data/vendor/libgit2/src/mwindow.c +24 -29
  261. data/vendor/libgit2/src/mwindow.h +4 -4
  262. data/vendor/libgit2/src/net.c +184 -0
  263. data/vendor/libgit2/src/net.h +36 -0
  264. data/vendor/libgit2/src/netops.c +55 -156
  265. data/vendor/libgit2/src/netops.h +3 -23
  266. data/vendor/libgit2/src/notes.c +16 -11
  267. data/vendor/libgit2/src/object.c +120 -69
  268. data/vendor/libgit2/src/object.h +22 -9
  269. data/vendor/libgit2/src/object_api.c +8 -8
  270. data/vendor/libgit2/src/odb.c +116 -93
  271. data/vendor/libgit2/src/odb.h +8 -7
  272. data/vendor/libgit2/src/odb_loose.c +62 -55
  273. data/vendor/libgit2/src/odb_mempack.c +21 -34
  274. data/vendor/libgit2/src/odb_pack.c +18 -14
  275. data/vendor/libgit2/src/offmap.c +53 -35
  276. data/vendor/libgit2/src/offmap.h +108 -21
  277. data/vendor/libgit2/src/oid.c +12 -7
  278. data/vendor/libgit2/src/oidmap.c +49 -47
  279. data/vendor/libgit2/src/oidmap.h +101 -24
  280. data/vendor/libgit2/src/pack-objects.c +88 -87
  281. data/vendor/libgit2/src/pack-objects.h +2 -8
  282. data/vendor/libgit2/src/pack.c +99 -101
  283. data/vendor/libgit2/src/pack.h +17 -19
  284. data/vendor/libgit2/src/parse.c +10 -0
  285. data/vendor/libgit2/src/parse.h +3 -3
  286. data/vendor/libgit2/src/patch.c +4 -4
  287. data/vendor/libgit2/src/patch_generate.c +20 -20
  288. data/vendor/libgit2/src/patch_parse.c +151 -63
  289. data/vendor/libgit2/src/path.c +169 -125
  290. data/vendor/libgit2/src/path.h +3 -71
  291. data/vendor/libgit2/src/pathspec.c +19 -19
  292. data/vendor/libgit2/src/pool.c +26 -22
  293. data/vendor/libgit2/src/pool.h +7 -7
  294. data/vendor/libgit2/src/posix.c +10 -10
  295. data/vendor/libgit2/src/posix.h +12 -1
  296. data/vendor/libgit2/src/proxy.c +8 -3
  297. data/vendor/libgit2/src/push.c +37 -31
  298. data/vendor/libgit2/src/push.h +2 -1
  299. data/vendor/libgit2/src/reader.c +265 -0
  300. data/vendor/libgit2/src/reader.h +107 -0
  301. data/vendor/libgit2/src/rebase.c +115 -59
  302. data/vendor/libgit2/src/refdb.c +15 -3
  303. data/vendor/libgit2/src/refdb_fs.c +381 -254
  304. data/vendor/libgit2/src/reflog.c +13 -15
  305. data/vendor/libgit2/src/refs.c +118 -88
  306. data/vendor/libgit2/src/refs.h +5 -3
  307. data/vendor/libgit2/src/refspec.c +56 -37
  308. data/vendor/libgit2/src/refspec.h +1 -1
  309. data/vendor/libgit2/src/regexp.c +221 -0
  310. data/vendor/libgit2/src/regexp.h +97 -0
  311. data/vendor/libgit2/src/remote.c +266 -215
  312. data/vendor/libgit2/src/remote.h +11 -2
  313. data/vendor/libgit2/src/repository.c +280 -225
  314. data/vendor/libgit2/src/repository.h +52 -40
  315. data/vendor/libgit2/src/reset.c +8 -8
  316. data/vendor/libgit2/src/revert.c +14 -9
  317. data/vendor/libgit2/src/revparse.c +47 -48
  318. data/vendor/libgit2/src/revwalk.c +120 -57
  319. data/vendor/libgit2/src/revwalk.h +22 -1
  320. data/vendor/libgit2/src/settings.c +47 -10
  321. data/vendor/libgit2/src/signature.c +11 -11
  322. data/vendor/libgit2/src/sortedcache.c +22 -36
  323. data/vendor/libgit2/src/sortedcache.h +1 -1
  324. data/vendor/libgit2/src/stash.c +125 -99
  325. data/vendor/libgit2/src/status.c +28 -22
  326. data/vendor/libgit2/src/stream.h +17 -2
  327. data/vendor/libgit2/src/streams/mbedtls.c +483 -0
  328. data/vendor/libgit2/src/streams/mbedtls.h +23 -0
  329. data/vendor/libgit2/src/streams/openssl.c +224 -114
  330. data/vendor/libgit2/src/streams/openssl.h +4 -108
  331. data/vendor/libgit2/src/streams/registry.c +118 -0
  332. data/vendor/libgit2/src/streams/registry.h +19 -0
  333. data/vendor/libgit2/src/streams/socket.c +55 -30
  334. data/vendor/libgit2/src/streams/stransport.c +57 -32
  335. data/vendor/libgit2/src/streams/stransport.h +5 -0
  336. data/vendor/libgit2/src/streams/tls.c +50 -19
  337. data/vendor/libgit2/src/streams/tls.h +12 -4
  338. data/vendor/libgit2/src/strmap.c +47 -74
  339. data/vendor/libgit2/src/strmap.h +108 -33
  340. data/vendor/libgit2/src/submodule.c +272 -216
  341. data/vendor/libgit2/src/submodule.h +1 -1
  342. data/vendor/libgit2/src/sysdir.c +29 -19
  343. data/vendor/libgit2/src/tag.c +41 -28
  344. data/vendor/libgit2/src/tag.h +2 -1
  345. data/vendor/libgit2/src/trace.c +2 -2
  346. data/vendor/libgit2/src/trace.h +3 -3
  347. data/vendor/libgit2/src/trailer.c +52 -38
  348. data/vendor/libgit2/src/transaction.c +30 -29
  349. data/vendor/libgit2/src/transport.c +5 -5
  350. data/vendor/libgit2/src/transports/auth.c +15 -11
  351. data/vendor/libgit2/src/transports/auth.h +10 -3
  352. data/vendor/libgit2/src/transports/auth_negotiate.c +33 -18
  353. data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
  354. data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
  355. data/vendor/libgit2/src/transports/auth_ntlm.h +35 -0
  356. data/vendor/libgit2/src/transports/cred.c +24 -24
  357. data/vendor/libgit2/src/transports/git.c +26 -31
  358. data/vendor/libgit2/src/transports/http.c +881 -348
  359. data/vendor/libgit2/src/transports/http.h +2 -0
  360. data/vendor/libgit2/src/transports/local.c +35 -35
  361. data/vendor/libgit2/src/transports/smart.c +70 -47
  362. data/vendor/libgit2/src/transports/smart.h +3 -4
  363. data/vendor/libgit2/src/transports/smart_pkt.c +43 -40
  364. data/vendor/libgit2/src/transports/smart_protocol.c +96 -116
  365. data/vendor/libgit2/src/transports/ssh.c +77 -66
  366. data/vendor/libgit2/src/transports/winhttp.c +318 -314
  367. data/vendor/libgit2/src/tree-cache.c +19 -12
  368. data/vendor/libgit2/src/tree.c +103 -142
  369. data/vendor/libgit2/src/tree.h +1 -12
  370. data/vendor/libgit2/src/unix/map.c +3 -3
  371. data/vendor/libgit2/src/unix/posix.h +1 -11
  372. data/vendor/libgit2/src/userdiff.h +3 -1
  373. data/vendor/libgit2/src/util.c +70 -56
  374. data/vendor/libgit2/src/util.h +28 -156
  375. data/vendor/libgit2/src/vector.c +4 -4
  376. data/vendor/libgit2/src/wildmatch.c +320 -0
  377. data/vendor/libgit2/src/wildmatch.h +23 -0
  378. data/vendor/libgit2/src/win32/dir.c +3 -3
  379. data/vendor/libgit2/src/win32/findfile.c +3 -3
  380. data/vendor/libgit2/src/win32/map.c +9 -11
  381. data/vendor/libgit2/src/win32/msvc-compat.h +6 -0
  382. data/vendor/libgit2/src/win32/path_w32.c +113 -9
  383. data/vendor/libgit2/src/win32/path_w32.h +18 -29
  384. data/vendor/libgit2/src/win32/posix.h +1 -4
  385. data/vendor/libgit2/src/win32/posix_w32.c +70 -45
  386. data/vendor/libgit2/src/win32/precompiled.h +0 -2
  387. data/vendor/libgit2/src/win32/thread.c +5 -10
  388. data/vendor/libgit2/src/win32/w32_buffer.c +9 -5
  389. data/vendor/libgit2/src/win32/w32_common.h +39 -0
  390. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +3 -2
  391. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +26 -75
  392. data/vendor/libgit2/src/win32/w32_stack.c +6 -11
  393. data/vendor/libgit2/src/win32/w32_stack.h +3 -3
  394. data/vendor/libgit2/src/win32/w32_util.c +27 -64
  395. data/vendor/libgit2/src/win32/w32_util.h +5 -49
  396. data/vendor/libgit2/src/worktree.c +95 -60
  397. data/vendor/libgit2/src/worktree.h +2 -0
  398. data/vendor/libgit2/src/xdiff/xdiffi.c +7 -5
  399. data/vendor/libgit2/src/xdiff/xhistogram.c +1 -1
  400. data/vendor/libgit2/src/xdiff/xmerge.c +27 -15
  401. data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
  402. data/vendor/libgit2/src/zstream.c +4 -4
  403. metadata +122 -33
  404. data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
  405. data/vendor/libgit2/deps/regex/config.h +0 -7
  406. data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
  407. data/vendor/libgit2/deps/regex/regex.c +0 -92
  408. data/vendor/libgit2/deps/regex/regex.h +0 -582
  409. data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
  410. data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
  411. data/vendor/libgit2/deps/regex/regexec.c +0 -4369
  412. data/vendor/libgit2/include/git2/inttypes.h +0 -309
  413. data/vendor/libgit2/include/git2/sys/time.h +0 -31
  414. data/vendor/libgit2/libgit2.pc.in +0 -13
  415. data/vendor/libgit2/src/config_file.h +0 -73
  416. data/vendor/libgit2/src/fnmatch.c +0 -248
  417. data/vendor/libgit2/src/fnmatch.h +0 -48
  418. data/vendor/libgit2/src/hash/hash_collisiondetect.h +0 -47
  419. data/vendor/libgit2/src/hash/hash_openssl.h +0 -59
  420. data/vendor/libgit2/src/streams/curl.c +0 -385
@@ -0,0 +1,101 @@
1
+ /*
2
+ * Copyright (C) the libgit2 contributors. All rights reserved.
3
+ *
4
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
5
+ * a Linking Exception. For full terms see the included COPYING file.
6
+ */
7
+
8
+ #ifndef INCLUDE_sys_git_alloc_h__
9
+ #define INCLUDE_sys_git_alloc_h__
10
+
11
+ #include "git2/common.h"
12
+
13
+ GIT_BEGIN_DECL
14
+
15
+ /**
16
+ * An instance for a custom memory allocator
17
+ *
18
+ * Setting the pointers of this structure allows the developer to implement
19
+ * custom memory allocators. The global memory allocator can be set by using
20
+ * "GIT_OPT_SET_ALLOCATOR" with the `git_libgit2_opts` function. Keep in mind
21
+ * that all fields need to be set to a proper function.
22
+ */
23
+ typedef struct {
24
+ /** Allocate `n` bytes of memory */
25
+ void * GIT_CALLBACK(gmalloc)(size_t n, const char *file, int line);
26
+
27
+ /**
28
+ * Allocate memory for an array of `nelem` elements, where each element
29
+ * has a size of `elsize`. Returned memory shall be initialized to
30
+ * all-zeroes
31
+ */
32
+ void * GIT_CALLBACK(gcalloc)(size_t nelem, size_t elsize, const char *file, int line);
33
+
34
+ /** Allocate memory for the string `str` and duplicate its contents. */
35
+ char * GIT_CALLBACK(gstrdup)(const char *str, const char *file, int line);
36
+
37
+ /**
38
+ * Equivalent to the `gstrdup` function, but only duplicating at most
39
+ * `n + 1` bytes
40
+ */
41
+ char * GIT_CALLBACK(gstrndup)(const char *str, size_t n, const char *file, int line);
42
+
43
+ /**
44
+ * Equivalent to `gstrndup`, but will always duplicate exactly `n` bytes
45
+ * of `str`. Thus, out of bounds reads at `str` may happen.
46
+ */
47
+ char * GIT_CALLBACK(gsubstrdup)(const char *str, size_t n, const char *file, int line);
48
+
49
+ /**
50
+ * This function shall deallocate the old object `ptr` and return a
51
+ * pointer to a new object that has the size specified by `size`. In
52
+ * case `ptr` is `NULL`, a new array shall be allocated.
53
+ */
54
+ void * GIT_CALLBACK(grealloc)(void *ptr, size_t size, const char *file, int line);
55
+
56
+ /**
57
+ * This function shall be equivalent to `grealloc`, but allocating
58
+ * `neleme * elsize` bytes.
59
+ */
60
+ void * GIT_CALLBACK(greallocarray)(void *ptr, size_t nelem, size_t elsize, const char *file, int line);
61
+
62
+ /**
63
+ * This function shall allocate a new array of `nelem` elements, where
64
+ * each element has a size of `elsize` bytes.
65
+ */
66
+ void * GIT_CALLBACK(gmallocarray)(size_t nelem, size_t elsize, const char *file, int line);
67
+
68
+ /**
69
+ * This function shall free the memory pointed to by `ptr`. In case
70
+ * `ptr` is `NULL`, this shall be a no-op.
71
+ */
72
+ void GIT_CALLBACK(gfree)(void *ptr);
73
+ } git_allocator;
74
+
75
+ /**
76
+ * Initialize the allocator structure to use the `stdalloc` pointer.
77
+ *
78
+ * Set up the structure so that all of its members are using the standard
79
+ * "stdalloc" allocator functions. The structure can then be used with
80
+ * `git_allocator_setup`.
81
+ *
82
+ * @param allocator The allocator that is to be initialized.
83
+ * @return An error code or 0.
84
+ */
85
+ int git_stdalloc_init_allocator(git_allocator *allocator);
86
+
87
+ /**
88
+ * Initialize the allocator structure to use the `crtdbg` pointer.
89
+ *
90
+ * Set up the structure so that all of its members are using the "crtdbg"
91
+ * allocator functions. Note that this allocator is only available on Windows
92
+ * platforms and only if libgit2 is being compiled with "-DMSVC_CRTDBG".
93
+ *
94
+ * @param allocator The allocator that is to be initialized.
95
+ * @return An error code or 0.
96
+ */
97
+ int git_win32_crtdbg_init_allocator(git_allocator *allocator);
98
+
99
+ GIT_END_DECL
100
+
101
+ #endif
@@ -50,7 +50,7 @@ GIT_EXTERN(int) git_commit_create_from_ids(
50
50
  * along with the user supplied payload. This should return a git_oid of
51
51
  * the next parent or NULL if all parents have been provided.
52
52
  */
53
- typedef const git_oid *(*git_commit_parent_callback)(size_t idx, void *payload);
53
+ typedef const git_oid * GIT_CALLBACK(git_commit_parent_callback)(size_t idx, void *payload);
54
54
 
55
55
  /**
56
56
  * Create a new commit in the repository with an callback to supply parents.
@@ -39,12 +39,12 @@ struct git_config_iterator {
39
39
  * Return the current entry and advance the iterator. The
40
40
  * memory belongs to the library.
41
41
  */
42
- int (*next)(git_config_entry **entry, git_config_iterator *iter);
42
+ int GIT_CALLBACK(next)(git_config_entry **entry, git_config_iterator *iter);
43
43
 
44
44
  /**
45
45
  * Free the iterator
46
46
  */
47
- void (*free)(git_config_iterator *iter);
47
+ void GIT_CALLBACK(free)(git_config_iterator *iter);
48
48
  };
49
49
 
50
50
  /**
@@ -58,15 +58,15 @@ struct git_config_backend {
58
58
  struct git_config *cfg;
59
59
 
60
60
  /* Open means open the file/database and parse if necessary */
61
- int (*open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
62
- int (*get)(struct git_config_backend *, const char *key, git_config_entry **entry);
63
- int (*set)(struct git_config_backend *, const char *key, const char *value);
64
- int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
65
- int (*del)(struct git_config_backend *, const char *key);
66
- int (*del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
67
- int (*iterator)(git_config_iterator **, struct git_config_backend *);
61
+ int GIT_CALLBACK(open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
62
+ int GIT_CALLBACK(get)(struct git_config_backend *, const char *key, git_config_entry **entry);
63
+ int GIT_CALLBACK(set)(struct git_config_backend *, const char *key, const char *value);
64
+ int GIT_CALLBACK(set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
65
+ int GIT_CALLBACK(del)(struct git_config_backend *, const char *key);
66
+ int GIT_CALLBACK(del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
67
+ int GIT_CALLBACK(iterator)(git_config_iterator **, struct git_config_backend *);
68
68
  /** Produce a read-only version of this backend */
69
- int (*snapshot)(struct git_config_backend **, struct git_config_backend *);
69
+ int GIT_CALLBACK(snapshot)(struct git_config_backend **, struct git_config_backend *);
70
70
  /**
71
71
  * Lock this backend.
72
72
  *
@@ -74,14 +74,14 @@ struct git_config_backend {
74
74
  * backend. Any updates must not be visible to any other
75
75
  * readers.
76
76
  */
77
- int (*lock)(struct git_config_backend *);
77
+ int GIT_CALLBACK(lock)(struct git_config_backend *);
78
78
  /**
79
79
  * Unlock the data store backing this backend. If success is
80
80
  * true, the changes should be committed, otherwise rolled
81
81
  * back.
82
82
  */
83
- int (*unlock)(struct git_config_backend *, int success);
84
- void (*free)(struct git_config_backend *);
83
+ int GIT_CALLBACK(unlock)(struct git_config_backend *, int success);
84
+ void GIT_CALLBACK(free)(struct git_config_backend *);
85
85
  };
86
86
  #define GIT_CONFIG_BACKEND_VERSION 1
87
87
  #define GIT_CONFIG_BACKEND_INIT {GIT_CONFIG_BACKEND_VERSION}
@@ -0,0 +1,90 @@
1
+ /*
2
+ * Copyright (C) the libgit2 contributors. All rights reserved.
3
+ *
4
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
5
+ * a Linking Exception. For full terms see the included COPYING file.
6
+ */
7
+ #ifndef INCLUDE_sys_git_cred_h__
8
+ #define INCLUDE_sys_git_cred_h__
9
+
10
+ #include "git2/common.h"
11
+ #include "git2/cred.h"
12
+
13
+ /**
14
+ * @file git2/sys/cred.h
15
+ * @brief Git credentials low-level implementation
16
+ * @defgroup git_cred Git credentials low-level implementation
17
+ * @ingroup Git
18
+ * @{
19
+ */
20
+ GIT_BEGIN_DECL
21
+
22
+ /**
23
+ * The base structure for all credential types
24
+ */
25
+ struct git_cred {
26
+ git_credtype_t credtype; /**< A type of credential */
27
+
28
+ /** The deallocator for this type of credentials */
29
+ void GIT_CALLBACK(free)(git_cred *cred);
30
+ };
31
+
32
+ /** A plaintext username and password */
33
+ struct git_cred_userpass_plaintext {
34
+ git_cred parent; /**< The parent cred */
35
+ char *username; /**< The username to authenticate as */
36
+ char *password; /**< The password to use */
37
+ };
38
+
39
+ /** Username-only credential information */
40
+ struct git_cred_username {
41
+ git_cred parent; /**< The parent cred */
42
+ char username[1]; /**< The username to authenticate as */
43
+ };
44
+
45
+ /**
46
+ * A ssh key from disk
47
+ */
48
+ struct git_cred_ssh_key {
49
+ git_cred parent; /**< The parent cred */
50
+ char *username; /**< The username to authenticate as */
51
+ char *publickey; /**< The path to a public key */
52
+ char *privatekey; /**< The path to a private key */
53
+ char *passphrase; /**< Passphrase used to decrypt the private key */
54
+ };
55
+
56
+ /**
57
+ * Keyboard-interactive based ssh authentication
58
+ */
59
+ struct git_cred_ssh_interactive {
60
+ git_cred parent; /**< The parent cred */
61
+ char *username; /**< The username to authenticate as */
62
+
63
+ /**
64
+ * Callback used for authentication.
65
+ */
66
+ git_cred_ssh_interactive_cb prompt_callback;
67
+
68
+ void *payload; /**< Payload passed to prompt_callback */
69
+ };
70
+
71
+ /**
72
+ * A key with a custom signature function
73
+ */
74
+ struct git_cred_ssh_custom {
75
+ git_cred parent; /**< The parent cred */
76
+ char *username; /**< The username to authenticate as */
77
+ char *publickey; /**< The public key data */
78
+ size_t publickey_len; /**< Length of the public key */
79
+
80
+ /**
81
+ * Callback used to sign the data.
82
+ */
83
+ git_cred_sign_cb sign_callback;
84
+
85
+ void *payload; /**< Payload passed to prompt_callback */
86
+ };
87
+
88
+ GIT_END_DECL
89
+
90
+ #endif
@@ -138,7 +138,7 @@ GIT_EXTERN(uint32_t) git_filter_source_flags(const git_filter_source *src);
138
138
  * initialization operations (in case libgit2 is being used in a way that
139
139
  * doesn't need the filter).
140
140
  */
141
- typedef int (*git_filter_init_fn)(git_filter *self);
141
+ typedef int GIT_CALLBACK(git_filter_init_fn)(git_filter *self);
142
142
 
143
143
  /**
144
144
  * Shutdown callback on filter
@@ -150,7 +150,7 @@ typedef int (*git_filter_init_fn)(git_filter *self);
150
150
  *
151
151
  * Typically this function will free the `git_filter` object itself.
152
152
  */
153
- typedef void (*git_filter_shutdown_fn)(git_filter *self);
153
+ typedef void GIT_CALLBACK(git_filter_shutdown_fn)(git_filter *self);
154
154
 
155
155
  /**
156
156
  * Callback to decide if a given source needs this filter
@@ -172,7 +172,7 @@ typedef void (*git_filter_shutdown_fn)(git_filter *self);
172
172
  * callback can use it. If a filter allocates and assigns a value to the
173
173
  * `payload`, it will need a `cleanup` callback to free the payload.
174
174
  */
175
- typedef int (*git_filter_check_fn)(
175
+ typedef int GIT_CALLBACK(git_filter_check_fn)(
176
176
  git_filter *self,
177
177
  void **payload, /* points to NULL ptr on entry, may be set */
178
178
  const git_filter_source *src,
@@ -190,14 +190,14 @@ typedef int (*git_filter_check_fn)(
190
190
  * The `payload` value will refer to any payload that was set by the
191
191
  * `check` callback. It may be read from or written to as needed.
192
192
  */
193
- typedef int (*git_filter_apply_fn)(
193
+ typedef int GIT_CALLBACK(git_filter_apply_fn)(
194
194
  git_filter *self,
195
195
  void **payload, /* may be read and/or set */
196
196
  git_buf *to,
197
197
  const git_buf *from,
198
198
  const git_filter_source *src);
199
199
 
200
- typedef int (*git_filter_stream_fn)(
200
+ typedef int GIT_CALLBACK(git_filter_stream_fn)(
201
201
  git_writestream **out,
202
202
  git_filter *self,
203
203
  void **payload,
@@ -212,7 +212,7 @@ typedef int (*git_filter_stream_fn)(
212
212
  * allocated a `payload` to keep per-source filter state, use this
213
213
  * callback to free that payload and release resources as required.
214
214
  */
215
- typedef void (*git_filter_cleanup_fn)(
215
+ typedef void GIT_CALLBACK(git_filter_cleanup_fn)(
216
216
  git_filter *self,
217
217
  void *payload);
218
218
 
@@ -7,6 +7,9 @@
7
7
  #ifndef INCLUDE_sys_git_index_h__
8
8
  #define INCLUDE_sys_git_index_h__
9
9
 
10
+ #include "git2/common.h"
11
+ #include "git2/types.h"
12
+
10
13
  /**
11
14
  * @file git2/sys/index.h
12
15
  * @brief Low-level Git index manipulation routines
@@ -23,61 +23,61 @@
23
23
  GIT_BEGIN_DECL
24
24
 
25
25
  /**
26
- * Instantiate a new mempack backend.
26
+ * Instantiate a new mempack backend.
27
27
  *
28
- * The backend must be added to an existing ODB with the highest
29
- * priority.
28
+ * The backend must be added to an existing ODB with the highest
29
+ * priority.
30
30
  *
31
- * git_mempack_new(&mempacker);
32
- * git_repository_odb(&odb, repository);
33
- * git_odb_add_backend(odb, mempacker, 999);
31
+ * git_mempack_new(&mempacker);
32
+ * git_repository_odb(&odb, repository);
33
+ * git_odb_add_backend(odb, mempacker, 999);
34
34
  *
35
- * Once the backend has been loaded, all writes to the ODB will
36
- * instead be queued in memory, and can be finalized with
37
- * `git_mempack_dump`.
35
+ * Once the backend has been loaded, all writes to the ODB will
36
+ * instead be queued in memory, and can be finalized with
37
+ * `git_mempack_dump`.
38
38
  *
39
- * Subsequent reads will also be served from the in-memory store
40
- * to ensure consistency, until the memory store is dumped.
39
+ * Subsequent reads will also be served from the in-memory store
40
+ * to ensure consistency, until the memory store is dumped.
41
41
  *
42
- * @param out Pointer where to store the ODB backend
43
- * @return 0 on success; error code otherwise
42
+ * @param out Pointer where to store the ODB backend
43
+ * @return 0 on success; error code otherwise
44
44
  */
45
45
  GIT_EXTERN(int) git_mempack_new(git_odb_backend **out);
46
46
 
47
47
  /**
48
- * Dump all the queued in-memory writes to a packfile.
48
+ * Dump all the queued in-memory writes to a packfile.
49
49
  *
50
- * The contents of the packfile will be stored in the given buffer.
51
- * It is the caller's responsibility to ensure that the generated
52
- * packfile is available to the repository (e.g. by writing it
53
- * to disk, or doing something crazy like distributing it across
54
- * several copies of the repository over a network).
50
+ * The contents of the packfile will be stored in the given buffer.
51
+ * It is the caller's responsibility to ensure that the generated
52
+ * packfile is available to the repository (e.g. by writing it
53
+ * to disk, or doing something crazy like distributing it across
54
+ * several copies of the repository over a network).
55
55
  *
56
- * Once the generated packfile is available to the repository,
57
- * call `git_mempack_reset` to cleanup the memory store.
56
+ * Once the generated packfile is available to the repository,
57
+ * call `git_mempack_reset` to cleanup the memory store.
58
58
  *
59
- * Calling `git_mempack_reset` before the packfile has been
60
- * written to disk will result in an inconsistent repository
61
- * (the objects in the memory store won't be accessible).
59
+ * Calling `git_mempack_reset` before the packfile has been
60
+ * written to disk will result in an inconsistent repository
61
+ * (the objects in the memory store won't be accessible).
62
62
  *
63
- * @param pack Buffer where to store the raw packfile
64
- * @param repo The active repository where the backend is loaded
65
- * @param backend The mempack backend
66
- * @return 0 on success; error code otherwise
63
+ * @param pack Buffer where to store the raw packfile
64
+ * @param repo The active repository where the backend is loaded
65
+ * @param backend The mempack backend
66
+ * @return 0 on success; error code otherwise
67
67
  */
68
68
  GIT_EXTERN(int) git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *backend);
69
69
 
70
70
  /**
71
- * Reset the memory packer by clearing all the queued objects.
71
+ * Reset the memory packer by clearing all the queued objects.
72
72
  *
73
- * This assumes that `git_mempack_dump` has been called before to
74
- * store all the queued objects into a single packfile.
73
+ * This assumes that `git_mempack_dump` has been called before to
74
+ * store all the queued objects into a single packfile.
75
75
  *
76
- * Alternatively, call `reset` without a previous dump to "undo"
77
- * all the recently written objects, giving transaction-like
78
- * semantics to the Git repository.
76
+ * Alternatively, call `reset` without a previous dump to "undo"
77
+ * all the recently written objects, giving transaction-like
78
+ * semantics to the Git repository.
79
79
  *
80
- * @param backend The mempack backend
80
+ * @param backend The mempack backend
81
81
  */
82
82
  GIT_EXTERN(void) git_mempack_reset(git_odb_backend *backend);
83
83
 
@@ -7,10 +7,15 @@
7
7
  #ifndef INCLUDE_sys_git_merge_h__
8
8
  #define INCLUDE_sys_git_merge_h__
9
9
 
10
+ #include "git2/common.h"
11
+ #include "git2/types.h"
12
+ #include "git2/index.h"
13
+ #include "git2/merge.h"
14
+
10
15
  /**
11
16
  * @file git2/sys/merge.h
12
17
  * @brief Git merge driver backend and plugin routines
13
- * @defgroup git_backend Git custom backend APIs
18
+ * @defgroup git_merge Git merge driver APIs
14
19
  * @ingroup Git
15
20
  * @{
16
21
  */
@@ -68,7 +73,7 @@ GIT_EXTERN(const git_merge_file_options *) git_merge_driver_source_file_options(
68
73
  * initialization operations (in case libgit2 is being used in a way that
69
74
  * doesn't need the merge driver).
70
75
  */
71
- typedef int (*git_merge_driver_init_fn)(git_merge_driver *self);
76
+ typedef int GIT_CALLBACK(git_merge_driver_init_fn)(git_merge_driver *self);
72
77
 
73
78
  /**
74
79
  * Shutdown callback on merge driver
@@ -80,7 +85,7 @@ typedef int (*git_merge_driver_init_fn)(git_merge_driver *self);
80
85
  *
81
86
  * Typically this function will free the `git_merge_driver` object itself.
82
87
  */
83
- typedef void (*git_merge_driver_shutdown_fn)(git_merge_driver *self);
88
+ typedef void GIT_CALLBACK(git_merge_driver_shutdown_fn)(git_merge_driver *self);
84
89
 
85
90
  /**
86
91
  * Callback to perform the merge.
@@ -100,7 +105,7 @@ typedef void (*git_merge_driver_shutdown_fn)(git_merge_driver *self);
100
105
  *
101
106
  * The `src` contains the data about the file to be merged.
102
107
  */
103
- typedef int (*git_merge_driver_apply_fn)(
108
+ typedef int GIT_CALLBACK(git_merge_driver_apply_fn)(
104
109
  git_merge_driver *self,
105
110
  const char **path_out,
106
111
  uint32_t *mode_out,