rugged 1.3.1 → 1.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (547) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +34 -2
  3. data/ext/rugged/extconf.rb +6 -3
  4. data/ext/rugged/rugged.c +16 -0
  5. data/ext/rugged/rugged.h +4 -0
  6. data/ext/rugged/rugged_blame.c +2 -0
  7. data/ext/rugged/rugged_blob.c +3 -0
  8. data/ext/rugged/rugged_commit.c +1 -0
  9. data/ext/rugged/rugged_config.c +9 -2
  10. data/ext/rugged/rugged_diff.c +1 -0
  11. data/ext/rugged/rugged_index.c +2 -0
  12. data/ext/rugged/rugged_patch.c +1 -0
  13. data/ext/rugged/rugged_rebase.c +1 -0
  14. data/ext/rugged/rugged_reference.c +1 -0
  15. data/ext/rugged/rugged_remote.c +28 -10
  16. data/ext/rugged/rugged_repo.c +7 -9
  17. data/ext/rugged/rugged_revwalk.c +5 -1
  18. data/ext/rugged/rugged_settings.c +5 -0
  19. data/ext/rugged/rugged_submodule.c +1 -0
  20. data/ext/rugged/rugged_tag.c +1 -0
  21. data/ext/rugged/rugged_tree.c +4 -0
  22. data/lib/rugged/index.rb +1 -1
  23. data/lib/rugged/tree.rb +5 -1
  24. data/lib/rugged/version.rb +1 -1
  25. data/vendor/libgit2/CMakeLists.txt +132 -288
  26. data/vendor/libgit2/COPYING +106 -19
  27. data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
  28. data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
  29. data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
  30. data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
  31. data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
  32. data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
  33. data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
  34. data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
  35. data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
  36. data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
  37. data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
  38. data/vendor/libgit2/cmake/FindPCRE.cmake +12 -13
  39. data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
  40. data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
  41. data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
  42. data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
  43. data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
  44. data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
  45. data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
  46. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
  47. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
  48. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
  49. data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
  50. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
  51. data/vendor/libgit2/cmake/SelectHashes.cmake +91 -53
  52. data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
  53. data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
  54. data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
  55. data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
  56. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
  57. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
  58. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +3 -1
  59. data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
  60. data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
  61. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
  62. data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
  63. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
  64. data/vendor/libgit2/deps/zlib/adler32.c +7 -0
  65. data/vendor/libgit2/deps/zlib/crc32.c +975 -288
  66. data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
  67. data/vendor/libgit2/deps/zlib/deflate.c +83 -31
  68. data/vendor/libgit2/deps/zlib/deflate.h +12 -15
  69. data/vendor/libgit2/deps/zlib/gzguts.h +3 -2
  70. data/vendor/libgit2/deps/zlib/infback.c +2 -1
  71. data/vendor/libgit2/deps/zlib/inffast.c +14 -14
  72. data/vendor/libgit2/deps/zlib/inflate.c +39 -8
  73. data/vendor/libgit2/deps/zlib/inflate.h +3 -2
  74. data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
  75. data/vendor/libgit2/deps/zlib/trees.c +27 -48
  76. data/vendor/libgit2/deps/zlib/zlib.h +126 -100
  77. data/vendor/libgit2/deps/zlib/zutil.c +2 -2
  78. data/vendor/libgit2/deps/zlib/zutil.h +12 -9
  79. data/vendor/libgit2/include/git2/apply.h +16 -2
  80. data/vendor/libgit2/include/git2/attr.h +11 -2
  81. data/vendor/libgit2/include/git2/blame.h +4 -1
  82. data/vendor/libgit2/include/git2/blob.h +14 -1
  83. data/vendor/libgit2/include/git2/branch.h +4 -2
  84. data/vendor/libgit2/include/git2/buffer.h +18 -78
  85. data/vendor/libgit2/include/git2/cert.h +2 -2
  86. data/vendor/libgit2/include/git2/checkout.h +5 -2
  87. data/vendor/libgit2/include/git2/clone.h +3 -3
  88. data/vendor/libgit2/include/git2/commit.h +2 -0
  89. data/vendor/libgit2/include/git2/common.h +38 -7
  90. data/vendor/libgit2/include/git2/config.h +25 -9
  91. data/vendor/libgit2/include/git2/credential.h +2 -1
  92. data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
  93. data/vendor/libgit2/include/git2/deprecated.h +9 -1
  94. data/vendor/libgit2/include/git2/describe.h +7 -2
  95. data/vendor/libgit2/include/git2/diff.h +18 -10
  96. data/vendor/libgit2/include/git2/email.h +1 -1
  97. data/vendor/libgit2/include/git2/errors.h +18 -3
  98. data/vendor/libgit2/include/git2/experimental.h +20 -0
  99. data/vendor/libgit2/include/git2/filter.h +7 -2
  100. data/vendor/libgit2/include/git2/graph.h +1 -0
  101. data/vendor/libgit2/include/git2/ignore.h +1 -1
  102. data/vendor/libgit2/include/git2/index.h +11 -5
  103. data/vendor/libgit2/include/git2/indexer.h +48 -0
  104. data/vendor/libgit2/include/git2/merge.h +24 -4
  105. data/vendor/libgit2/include/git2/message.h +2 -0
  106. data/vendor/libgit2/include/git2/object.h +49 -0
  107. data/vendor/libgit2/include/git2/odb.h +94 -13
  108. data/vendor/libgit2/include/git2/odb_backend.h +107 -19
  109. data/vendor/libgit2/include/git2/oid.h +115 -15
  110. data/vendor/libgit2/include/git2/pack.h +24 -8
  111. data/vendor/libgit2/include/git2/patch.h +8 -0
  112. data/vendor/libgit2/include/git2/pathspec.h +1 -1
  113. data/vendor/libgit2/include/git2/proxy.h +1 -1
  114. data/vendor/libgit2/include/git2/rebase.h +9 -1
  115. data/vendor/libgit2/include/git2/refdb.h +3 -0
  116. data/vendor/libgit2/include/git2/reflog.h +1 -1
  117. data/vendor/libgit2/include/git2/refs.h +2 -2
  118. data/vendor/libgit2/include/git2/remote.h +184 -37
  119. data/vendor/libgit2/include/git2/repository.h +34 -10
  120. data/vendor/libgit2/include/git2/reset.h +2 -2
  121. data/vendor/libgit2/include/git2/revparse.h +1 -1
  122. data/vendor/libgit2/include/git2/revwalk.h +4 -1
  123. data/vendor/libgit2/include/git2/signature.h +1 -1
  124. data/vendor/libgit2/include/git2/stash.h +61 -7
  125. data/vendor/libgit2/include/git2/status.h +14 -5
  126. data/vendor/libgit2/include/git2/strarray.h +0 -13
  127. data/vendor/libgit2/include/git2/submodule.h +7 -2
  128. data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
  129. data/vendor/libgit2/include/git2/sys/odb_backend.h +3 -6
  130. data/vendor/libgit2/include/git2/sys/remote.h +46 -0
  131. data/vendor/libgit2/include/git2/sys/stream.h +1 -1
  132. data/vendor/libgit2/include/git2/sys/transport.h +46 -39
  133. data/vendor/libgit2/include/git2/tag.h +1 -0
  134. data/vendor/libgit2/include/git2/tree.h +4 -3
  135. data/vendor/libgit2/include/git2/types.h +7 -7
  136. data/vendor/libgit2/include/git2/version.h +27 -6
  137. data/vendor/libgit2/include/git2/worktree.h +12 -2
  138. data/vendor/libgit2/include/git2.h +1 -0
  139. data/vendor/libgit2/src/CMakeLists.txt +177 -419
  140. data/vendor/libgit2/src/README.md +12 -0
  141. data/vendor/libgit2/src/cli/CMakeLists.txt +57 -0
  142. data/vendor/libgit2/src/cli/README.md +26 -0
  143. data/vendor/libgit2/src/cli/cli.h +20 -0
  144. data/vendor/libgit2/src/cli/cmd.c +21 -0
  145. data/vendor/libgit2/src/cli/cmd.h +33 -0
  146. data/vendor/libgit2/src/cli/cmd_cat_file.c +204 -0
  147. data/vendor/libgit2/src/cli/cmd_clone.c +176 -0
  148. data/vendor/libgit2/src/cli/cmd_hash_object.c +154 -0
  149. data/vendor/libgit2/src/cli/cmd_help.c +86 -0
  150. data/vendor/libgit2/src/cli/error.h +51 -0
  151. data/vendor/libgit2/src/cli/main.c +106 -0
  152. data/vendor/libgit2/src/cli/opt.c +669 -0
  153. data/vendor/libgit2/src/cli/opt.h +349 -0
  154. data/vendor/libgit2/src/cli/opt_usage.c +194 -0
  155. data/vendor/libgit2/src/cli/opt_usage.h +35 -0
  156. data/vendor/libgit2/src/cli/progress.c +345 -0
  157. data/vendor/libgit2/src/cli/progress.h +117 -0
  158. data/vendor/libgit2/src/cli/sighandler.h +20 -0
  159. data/vendor/libgit2/src/cli/unix/sighandler.c +36 -0
  160. data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
  161. data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
  162. data/vendor/libgit2/src/libgit2/CMakeLists.txt +141 -0
  163. data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +1 -1
  164. data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
  165. data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +18 -18
  166. data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
  167. data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +18 -18
  168. data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +18 -18
  169. data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +4 -4
  170. data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +18 -13
  171. data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +2 -0
  172. data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -1
  173. data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
  174. data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
  175. data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
  176. data/vendor/libgit2/src/{branch.h → libgit2/branch.h} +15 -3
  177. data/vendor/libgit2/src/libgit2/buf.c +126 -0
  178. data/vendor/libgit2/src/libgit2/buf.h +50 -0
  179. data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +74 -68
  180. data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +13 -13
  181. data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +96 -67
  182. data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +178 -73
  183. data/vendor/libgit2/src/libgit2/commit.h +87 -0
  184. data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +122 -89
  185. data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +14 -4
  186. data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +7 -4
  187. data/vendor/libgit2/src/libgit2/common.h +55 -0
  188. data/vendor/libgit2/src/{config.c → libgit2/config.c} +107 -71
  189. data/vendor/libgit2/src/{config.h → libgit2/config.h} +15 -2
  190. data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +105 -93
  191. data/vendor/libgit2/src/{config_mem.c → libgit2/config_mem.c} +9 -9
  192. data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +27 -23
  193. data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
  194. data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +35 -27
  195. data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +30 -9
  196. data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +2 -4
  197. data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +34 -36
  198. data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +3 -3
  199. data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +44 -26
  200. data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +47 -18
  201. data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
  202. data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +112 -100
  203. data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
  204. data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
  205. data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +13 -8
  206. data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
  207. data/vendor/libgit2/src/{email.c → libgit2/email.c} +55 -39
  208. data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
  209. data/vendor/libgit2/src/{errors.c → libgit2/errors.c} +18 -18
  210. data/vendor/libgit2/src/{errors.h → libgit2/errors.h} +1 -2
  211. data/vendor/libgit2/src/libgit2/experimental.h.in +13 -0
  212. data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +72 -27
  213. data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -1
  214. data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +23 -23
  215. data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +127 -53
  216. data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
  217. data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
  218. data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +35 -34
  219. data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
  220. data/vendor/libgit2/src/{index.c → libgit2/index.c} +91 -90
  221. data/vendor/libgit2/src/{index.h → libgit2/index.h} +6 -3
  222. data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +173 -92
  223. data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +71 -61
  224. data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +5 -5
  225. data/vendor/libgit2/src/{libgit2.c → libgit2/libgit2.c} +54 -11
  226. data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +38 -36
  227. data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +30 -30
  228. data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
  229. data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +2 -2
  230. data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -3
  231. data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
  232. data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +112 -92
  233. data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +5 -4
  234. data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +15 -12
  235. data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +5 -2
  236. data/vendor/libgit2/src/{netops.c → libgit2/netops.c} +1 -2
  237. data/vendor/libgit2/src/{netops.h → libgit2/netops.h} +1 -1
  238. data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +25 -34
  239. data/vendor/libgit2/src/{object.c → libgit2/object.c} +135 -30
  240. data/vendor/libgit2/src/{object.h → libgit2/object.h} +12 -3
  241. data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +228 -81
  242. data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
  243. data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
  244. data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +18 -5
  245. data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +137 -85
  246. data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +136 -90
  247. data/vendor/libgit2/src/libgit2/oid.h +273 -0
  248. data/vendor/libgit2/src/{oidmap.c → libgit2/oidmap.c} +1 -1
  249. data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +56 -30
  250. data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +11 -6
  251. data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +114 -84
  252. data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +31 -16
  253. data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +4 -3
  254. data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
  255. data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +1 -0
  256. data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +27 -11
  257. data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
  258. data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +29 -29
  259. data/vendor/libgit2/src/libgit2/path.c +375 -0
  260. data/vendor/libgit2/src/libgit2/path.h +68 -0
  261. data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +6 -6
  262. data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
  263. data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
  264. data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
  265. data/vendor/libgit2/src/{push.c → libgit2/push.c} +43 -38
  266. data/vendor/libgit2/src/{push.h → libgit2/push.h} +4 -16
  267. data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
  268. data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
  269. data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +119 -107
  270. data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +506 -197
  271. data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +7 -5
  272. data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +1 -2
  273. data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +34 -32
  274. data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +2 -2
  275. data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +32 -37
  276. data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +5 -2
  277. data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +718 -420
  278. data/vendor/libgit2/src/libgit2/remote.h +100 -0
  279. data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +690 -366
  280. data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +21 -9
  281. data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
  282. data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +14 -14
  283. data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +71 -42
  284. data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +12 -8
  285. data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +12 -6
  286. data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -1
  287. data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +235 -61
  288. data/vendor/libgit2/src/{status.c → libgit2/status.c} +4 -1
  289. data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
  290. data/vendor/libgit2/src/libgit2/strarray.h +25 -0
  291. data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +8 -6
  292. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +1 -1
  293. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +7 -3
  294. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +3 -3
  295. data/vendor/libgit2/src/{streams → libgit2/streams}/socket.c +4 -1
  296. data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +177 -161
  297. data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +1 -1
  298. data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
  299. data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +53 -18
  300. data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +73 -42
  301. data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
  302. data/vendor/libgit2/src/{threadstate.c → libgit2/threadstate.c} +3 -3
  303. data/vendor/libgit2/src/{threadstate.h → libgit2/threadstate.h} +2 -2
  304. data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
  305. data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
  306. data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +1 -1
  307. data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +1 -1
  308. data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +10 -10
  309. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
  310. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +2 -3
  311. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c +12 -13
  312. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c +10 -10
  313. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +0 -1
  314. data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +9 -11
  315. data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +41 -20
  316. data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +2 -3
  317. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +75 -66
  318. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
  319. data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +138 -116
  320. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +92 -133
  321. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +35 -32
  322. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +177 -65
  323. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +97 -49
  324. data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.c +365 -198
  325. data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +58 -59
  326. data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +8 -8
  327. data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +2 -2
  328. data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +93 -83
  329. data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +4 -4
  330. data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +121 -94
  331. data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
  332. data/vendor/libgit2/src/libgit2/xdiff/git-xdiff.h +53 -0
  333. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiff.h +15 -15
  334. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.c +134 -108
  335. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.c +23 -7
  336. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xhistogram.c +87 -78
  337. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xinclude.h +1 -12
  338. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmerge.c +104 -117
  339. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xpatience.c +6 -17
  340. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.c +15 -20
  341. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.c +18 -7
  342. data/vendor/libgit2/src/util/CMakeLists.txt +80 -0
  343. data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.h +1 -1
  344. data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
  345. data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
  346. data/vendor/libgit2/src/{array.h → util/array.h} +1 -1
  347. data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
  348. data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +1 -1
  349. data/vendor/libgit2/src/{date.c → util/date.c} +14 -20
  350. data/vendor/libgit2/src/util/date.h +33 -0
  351. data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +29 -29
  352. data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +2 -2
  353. data/vendor/libgit2/src/{path.c → util/fs_path.c} +580 -615
  354. data/vendor/libgit2/src/{path.h → util/fs_path.h} +234 -181
  355. data/vendor/libgit2/src/{futils.c → util/futils.c} +135 -90
  356. data/vendor/libgit2/src/{futils.h → util/futils.h} +28 -15
  357. data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +15 -1
  358. data/vendor/libgit2/src/{common.h → util/git2_util.h} +20 -59
  359. data/vendor/libgit2/src/util/hash/builtin.c +53 -0
  360. data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
  361. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
  362. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
  363. data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
  364. data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
  365. data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
  366. data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
  367. data/vendor/libgit2/src/util/hash/openssl.c +195 -0
  368. data/vendor/libgit2/src/util/hash/openssl.h +45 -0
  369. data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
  370. data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
  371. data/vendor/libgit2/src/util/hash/sha.h +70 -0
  372. data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
  373. data/vendor/libgit2/src/util/hash/win32.c +549 -0
  374. data/vendor/libgit2/src/util/hash/win32.h +60 -0
  375. data/vendor/libgit2/src/util/hash.c +158 -0
  376. data/vendor/libgit2/src/util/hash.h +61 -0
  377. data/vendor/libgit2/src/{khash.h → util/khash.h} +1 -1
  378. data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
  379. data/vendor/libgit2/src/util/net.c +1003 -0
  380. data/vendor/libgit2/src/{net.h → util/net.h} +18 -4
  381. data/vendor/libgit2/src/{pool.h → util/pool.h} +1 -1
  382. data/vendor/libgit2/src/{posix.c → util/posix.c} +3 -3
  383. data/vendor/libgit2/src/{posix.h → util/posix.h} +4 -1
  384. data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +2 -2
  385. data/vendor/libgit2/src/util/rand.c +234 -0
  386. data/vendor/libgit2/src/util/rand.h +37 -0
  387. data/vendor/libgit2/src/{regexp.c → util/regexp.c} +4 -4
  388. data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
  389. data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
  390. data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
  391. data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +1 -1
  392. data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +2 -2
  393. data/vendor/libgit2/src/{buffer.c → util/str.c} +157 -151
  394. data/vendor/libgit2/src/util/str.h +357 -0
  395. data/vendor/libgit2/src/{strmap.h → util/strmap.h} +1 -1
  396. data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
  397. data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
  398. data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
  399. data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
  400. data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -4
  401. data/vendor/libgit2/src/{unix → util/unix}/realpath.c +1 -3
  402. data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
  403. data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
  404. data/vendor/libgit2/src/{util.c → util/util.c} +15 -15
  405. data/vendor/libgit2/src/{util.h → util/util.h} +4 -29
  406. data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
  407. data/vendor/libgit2/src/{vector.h → util/vector.h} +2 -2
  408. data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
  409. data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
  410. data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
  411. data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
  412. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +140 -9
  413. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
  414. data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
  415. data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +12 -28
  416. data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
  417. data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
  418. data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
  419. data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h +1 -1
  420. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
  421. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
  422. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
  423. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
  424. data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
  425. data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
  426. data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
  427. metadata +402 -356
  428. data/vendor/libgit2/src/buffer.h +0 -374
  429. data/vendor/libgit2/src/commit.h +0 -46
  430. data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
  431. data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
  432. data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
  433. data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
  434. data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
  435. data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
  436. data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
  437. data/vendor/libgit2/src/hash/sha1.h +0 -38
  438. data/vendor/libgit2/src/hash.c +0 -110
  439. data/vendor/libgit2/src/hash.h +0 -46
  440. data/vendor/libgit2/src/message.h +0 -17
  441. data/vendor/libgit2/src/net.c +0 -540
  442. data/vendor/libgit2/src/oid.h +0 -51
  443. data/vendor/libgit2/src/remote.h +0 -55
  444. data/vendor/libgit2/src/sysdir.c +0 -347
  445. data/vendor/libgit2/src/win32/findfile.c +0 -230
  446. data/vendor/libgit2/src/win32/findfile.h +0 -19
  447. /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
  448. /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
  449. /data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +0 -0
  450. /data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +0 -0
  451. /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
  452. /data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +0 -0
  453. /data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +0 -0
  454. /data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -0
  455. /data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +0 -0
  456. /data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +0 -0
  457. /data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +0 -0
  458. /data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +0 -0
  459. /data/vendor/libgit2/src/{config_entries.c → libgit2/config_entries.c} +0 -0
  460. /data/vendor/libgit2/src/{config_entries.h → libgit2/config_entries.h} +0 -0
  461. /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
  462. /data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +0 -0
  463. /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
  464. /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
  465. /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
  466. /data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +0 -0
  467. /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
  468. /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
  469. /data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +0 -0
  470. /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
  471. /data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +0 -0
  472. /data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +0 -0
  473. /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
  474. /data/vendor/libgit2/src/{idxmap.c → libgit2/idxmap.c} +0 -0
  475. /data/vendor/libgit2/src/{idxmap.h → libgit2/idxmap.h} +0 -0
  476. /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
  477. /data/vendor/libgit2/src/{libgit2.h → libgit2/libgit2.h} +0 -0
  478. /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
  479. /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
  480. /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
  481. /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
  482. /data/vendor/libgit2/src/{offmap.c → libgit2/offmap.c} +0 -0
  483. /data/vendor/libgit2/src/{offmap.h → libgit2/offmap.h} +0 -0
  484. /data/vendor/libgit2/src/{oidarray.c → libgit2/oidarray.c} +0 -0
  485. /data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +0 -0
  486. /data/vendor/libgit2/src/{oidmap.h → libgit2/oidmap.h} +0 -0
  487. /data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +0 -0
  488. /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
  489. /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
  490. /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
  491. /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
  492. /data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +0 -0
  493. /data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +0 -0
  494. /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
  495. /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
  496. /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
  497. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +0 -0
  498. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
  499. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
  500. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
  501. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
  502. /data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +0 -0
  503. /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +0 -0
  504. /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
  505. /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +0 -0
  506. /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
  507. /data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +0 -0
  508. /data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +0 -0
  509. /data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +0 -0
  510. /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
  511. /data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.h +0 -0
  512. /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
  513. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.h +0 -0
  514. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.h +0 -0
  515. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmacros.h +0 -0
  516. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.h +0 -0
  517. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xtypes.h +0 -0
  518. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.h +0 -0
  519. /data/vendor/libgit2/src/{alloc.c → util/alloc.c} +0 -0
  520. /data/vendor/libgit2/src/{alloc.h → util/alloc.h} +0 -0
  521. /data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.c +0 -0
  522. /data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.c +0 -0
  523. /data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.c +0 -0
  524. /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
  525. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
  526. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
  527. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
  528. /data/vendor/libgit2/src/{integer.h → util/integer.h} +0 -0
  529. /data/vendor/libgit2/src/{pool.c → util/pool.c} +0 -0
  530. /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
  531. /data/vendor/libgit2/src/{strmap.c → util/strmap.c} +0 -0
  532. /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
  533. /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
  534. /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
  535. /data/vendor/libgit2/src/{vector.c → util/vector.c} +0 -0
  536. /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
  537. /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
  538. /data/vendor/libgit2/src/{win32 → util/win32}/error.c +0 -0
  539. /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
  540. /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
  541. /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
  542. /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
  543. /data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.c +0 -0
  544. /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
  545. /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
  546. /data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +0 -0
  547. /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -152,7 +152,7 @@ typedef enum {
152
152
  * No commit will be cherry-picked. The client should run the given
153
153
  * command and (if successful) continue.
154
154
  */
155
- GIT_REBASE_OPERATION_EXEC,
155
+ GIT_REBASE_OPERATION_EXEC
156
156
  } git_rebase_operation_t;
157
157
 
158
158
  #define GIT_REBASE_OPTIONS_VERSION 1
@@ -242,6 +242,7 @@ GIT_EXTERN(int) git_rebase_open(
242
242
  /**
243
243
  * Gets the original `HEAD` ref name for merge rebases.
244
244
  *
245
+ * @param rebase The in-progress rebase.
245
246
  * @return The original `HEAD` ref name
246
247
  */
247
248
  GIT_EXTERN(const char *) git_rebase_orig_head_name(git_rebase *rebase);
@@ -249,6 +250,7 @@ GIT_EXTERN(const char *) git_rebase_orig_head_name(git_rebase *rebase);
249
250
  /**
250
251
  * Gets the original `HEAD` id for merge rebases.
251
252
  *
253
+ * @param rebase The in-progress rebase.
252
254
  * @return The original `HEAD` id
253
255
  */
254
256
  GIT_EXTERN(const git_oid *) git_rebase_orig_head_id(git_rebase *rebase);
@@ -256,6 +258,7 @@ GIT_EXTERN(const git_oid *) git_rebase_orig_head_id(git_rebase *rebase);
256
258
  /**
257
259
  * Gets the `onto` ref name for merge rebases.
258
260
  *
261
+ * @param rebase The in-progress rebase.
259
262
  * @return The `onto` ref name
260
263
  */
261
264
  GIT_EXTERN(const char *) git_rebase_onto_name(git_rebase *rebase);
@@ -263,6 +266,7 @@ GIT_EXTERN(const char *) git_rebase_onto_name(git_rebase *rebase);
263
266
  /**
264
267
  * Gets the `onto` id for merge rebases.
265
268
  *
269
+ * @param rebase The in-progress rebase.
266
270
  * @return The `onto` id
267
271
  */
268
272
  GIT_EXTERN(const git_oid *) git_rebase_onto_id(git_rebase *rebase);
@@ -322,6 +326,10 @@ GIT_EXTERN(int) git_rebase_next(
322
326
  * This is only applicable for in-memory rebases; for rebases within
323
327
  * a working directory, the changes were applied to the repository's
324
328
  * index.
329
+ *
330
+ * @param index The result index of the last operation.
331
+ * @param rebase The in-progress rebase.
332
+ * @return 0 or an error code
325
333
  */
326
334
  GIT_EXTERN(int) git_rebase_inmemory_index(
327
335
  git_index **index,
@@ -52,6 +52,9 @@ GIT_EXTERN(int) git_refdb_open(git_refdb **out, git_repository *repo);
52
52
  * Suggests that the given refdb compress or optimize its references.
53
53
  * This mechanism is implementation specific. For on-disk reference
54
54
  * databases, for example, this may pack all loose references.
55
+ *
56
+ * @param refdb The reference database to optimize.
57
+ * @return 0 or an error code.
55
58
  */
56
59
  GIT_EXTERN(int) git_refdb_compress(git_refdb *refdb);
57
60
 
@@ -31,7 +31,7 @@ GIT_BEGIN_DECL
31
31
  * git_reflog_free().
32
32
  *
33
33
  * @param out pointer to reflog
34
- * @param repo the repostiory
34
+ * @param repo the repository
35
35
  * @param name reference to look up
36
36
  * @return 0 or an error code
37
37
  */
@@ -57,7 +57,7 @@ GIT_EXTERN(int) git_reference_name_to_id(
57
57
  /**
58
58
  * Lookup a reference by DWIMing its short name
59
59
  *
60
- * Apply the git precendence rules to the given shorthand to determine
60
+ * Apply the git precedence rules to the given shorthand to determine
61
61
  * which reference the user is referring to.
62
62
  *
63
63
  * @param out pointer in which to store the reference
@@ -686,7 +686,7 @@ typedef enum {
686
686
  * so the `ONELEVEL` naming rules aren't enforced and 'master'
687
687
  * becomes a valid name.
688
688
  */
689
- GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND = (1u << 2),
689
+ GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND = (1u << 2)
690
690
  } git_reference_format_t;
691
691
 
692
692
  /**
@@ -41,6 +41,30 @@ GIT_EXTERN(int) git_remote_create(
41
41
  const char *name,
42
42
  const char *url);
43
43
 
44
+ /**
45
+ * Remote redirection settings; whether redirects to another host
46
+ * are permitted. By default, git will follow a redirect on the
47
+ * initial request (`/info/refs`), but not subsequent requests.
48
+ */
49
+ typedef enum {
50
+ /**
51
+ * Do not follow any off-site redirects at any stage of
52
+ * the fetch or push.
53
+ */
54
+ GIT_REMOTE_REDIRECT_NONE = (1 << 0),
55
+
56
+ /**
57
+ * Allow off-site redirects only upon the initial request.
58
+ * This is the default.
59
+ */
60
+ GIT_REMOTE_REDIRECT_INITIAL = (1 << 1),
61
+
62
+ /**
63
+ * Allow redirects at any stage in the fetch or push.
64
+ */
65
+ GIT_REMOTE_REDIRECT_ALL = (1 << 2)
66
+ } git_remote_redirect_t;
67
+
44
68
  /**
45
69
  * Remote creation options flags
46
70
  */
@@ -49,7 +73,7 @@ typedef enum {
49
73
  GIT_REMOTE_CREATE_SKIP_INSTEADOF = (1 << 0),
50
74
 
51
75
  /** Don't build a fetchspec from the name if none is set */
52
- GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC = (1 << 1),
76
+ GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC = (1 << 1)
53
77
  } git_remote_create_flags;
54
78
 
55
79
  /**
@@ -300,6 +324,7 @@ GIT_EXTERN(int) git_remote_add_fetch(git_repository *repo, const char *remote, c
300
324
  *
301
325
  * @param array pointer to the array in which to store the strings
302
326
  * @param remote the remote to query
327
+ * @return 0 or an error code.
303
328
  */
304
329
  GIT_EXTERN(int) git_remote_get_fetch_refspecs(git_strarray *array, const git_remote *remote);
305
330
 
@@ -324,6 +349,7 @@ GIT_EXTERN(int) git_remote_add_push(git_repository *repo, const char *remote, co
324
349
  *
325
350
  * @param array pointer to the array in which to store the strings
326
351
  * @param remote the remote to query
352
+ * @return 0 or an error code.
327
353
  */
328
354
  GIT_EXTERN(int) git_remote_get_push_refspecs(git_strarray *array, const git_remote *remote);
329
355
 
@@ -344,23 +370,6 @@ GIT_EXTERN(size_t) git_remote_refspec_count(const git_remote *remote);
344
370
  */
345
371
  GIT_EXTERN(const git_refspec *)git_remote_get_refspec(const git_remote *remote, size_t n);
346
372
 
347
- /**
348
- * Open a connection to a remote
349
- *
350
- * The transport is selected based on the URL. The direction argument
351
- * is due to a limitation of the git protocol (over TCP or SSH) which
352
- * starts up a specific binary which can only do the one or the other.
353
- *
354
- * @param remote the remote to connect to
355
- * @param direction GIT_DIRECTION_FETCH if you want to fetch or
356
- * GIT_DIRECTION_PUSH if you want to push
357
- * @param callbacks the callbacks to use for this connection
358
- * @param proxy_opts proxy settings
359
- * @param custom_headers extra HTTP headers to use in this connection
360
- * @return 0 or an error code
361
- */
362
- GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_proxy_options *proxy_opts, const git_strarray *custom_headers);
363
-
364
373
  /**
365
374
  * Get the remote repository's reference advertisement list
366
375
  *
@@ -443,7 +452,7 @@ GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo);
443
452
  typedef enum git_remote_completion_t {
444
453
  GIT_REMOTE_COMPLETION_DOWNLOAD,
445
454
  GIT_REMOTE_COMPLETION_INDEXING,
446
- GIT_REMOTE_COMPLETION_ERROR,
455
+ GIT_REMOTE_COMPLETION_ERROR
447
456
  } git_remote_completion_t;
448
457
 
449
458
  /** Push network progress notification function */
@@ -665,7 +674,7 @@ typedef enum {
665
674
  /**
666
675
  * Force pruning off
667
676
  */
668
- GIT_FETCH_NO_PRUNE,
677
+ GIT_FETCH_NO_PRUNE
669
678
  } git_fetch_prune_t;
670
679
 
671
680
  /**
@@ -690,7 +699,7 @@ typedef enum {
690
699
  /**
691
700
  * Ask for the all the tags.
692
701
  */
693
- GIT_REMOTE_DOWNLOAD_TAGS_ALL,
702
+ GIT_REMOTE_DOWNLOAD_TAGS_ALL
694
703
  } git_remote_autotag_option_t;
695
704
 
696
705
  /**
@@ -734,6 +743,13 @@ typedef struct {
734
743
  */
735
744
  git_proxy_options proxy_opts;
736
745
 
746
+ /**
747
+ * Whether to allow off-site redirects. If this is not
748
+ * specified, the `http.followRedirects` configuration setting
749
+ * will be consulted.
750
+ */
751
+ git_remote_redirect_t follow_redirects;
752
+
737
753
  /**
738
754
  * Extra headers for this fetch operation
739
755
  */
@@ -785,6 +801,13 @@ typedef struct {
785
801
  */
786
802
  git_proxy_options proxy_opts;
787
803
 
804
+ /**
805
+ * Whether to allow off-site redirects. If this is not
806
+ * specified, the `http.followRedirects` configuration setting
807
+ * will be consulted.
808
+ */
809
+ git_remote_redirect_t follow_redirects;
810
+
788
811
  /**
789
812
  * Extra headers for this push operation
790
813
  */
@@ -809,7 +832,100 @@ GIT_EXTERN(int) git_push_options_init(
809
832
  unsigned int version);
810
833
 
811
834
  /**
812
- * Download and index the packfile
835
+ * Remote creation options structure
836
+ *
837
+ * Initialize with `GIT_REMOTE_CREATE_OPTIONS_INIT`. Alternatively, you can
838
+ * use `git_remote_create_options_init`.
839
+ *
840
+ */
841
+ typedef struct {
842
+ unsigned int version;
843
+
844
+ /** Callbacks to use for this connection */
845
+ git_remote_callbacks callbacks;
846
+
847
+ /** HTTP Proxy settings */
848
+ git_proxy_options proxy_opts;
849
+
850
+ /**
851
+ * Whether to allow off-site redirects. If this is not
852
+ * specified, the `http.followRedirects` configuration setting
853
+ * will be consulted.
854
+ */
855
+ git_remote_redirect_t follow_redirects;
856
+
857
+ /** Extra HTTP headers to use in this connection */
858
+ git_strarray custom_headers;
859
+ } git_remote_connect_options;
860
+
861
+ #define GIT_REMOTE_CONNECT_OPTIONS_VERSION 1
862
+ #define GIT_REMOTE_CONNECT_OPTIONS_INIT { \
863
+ GIT_REMOTE_CONNECT_OPTIONS_VERSION, \
864
+ GIT_REMOTE_CALLBACKS_INIT, \
865
+ GIT_PROXY_OPTIONS_INIT }
866
+
867
+ /**
868
+ * Initialize git_remote_connect_options structure.
869
+ *
870
+ * Initializes a `git_remote_connect_options` with default values.
871
+ * Equivalent to creating an instance with
872
+ * `GIT_REMOTE_CONNECT_OPTIONS_INIT`.
873
+ *
874
+ * @param opts The `git_remote_connect_options` struct to initialize.
875
+ * @param version The struct version; pass `GIT_REMOTE_CONNECT_OPTIONS_VERSION`.
876
+ * @return Zero on success; -1 on failure.
877
+ */
878
+ GIT_EXTERN(int) git_remote_connect_options_init(
879
+ git_remote_connect_options *opts,
880
+ unsigned int version);
881
+
882
+ /**
883
+ * Open a connection to a remote.
884
+ *
885
+ * The transport is selected based on the URL; the direction argument
886
+ * is due to a limitation of the git protocol which starts up a
887
+ * specific binary which can only do the one or the other.
888
+ *
889
+ * @param remote the remote to connect to
890
+ * @param direction GIT_DIRECTION_FETCH if you want to fetch or
891
+ * GIT_DIRECTION_PUSH if you want to push
892
+ * @param callbacks the callbacks to use for this connection
893
+ * @param proxy_opts proxy settings
894
+ * @param custom_headers extra HTTP headers to use in this connection
895
+ * @return 0 or an error code
896
+ */
897
+ GIT_EXTERN(int) git_remote_connect(
898
+ git_remote *remote,
899
+ git_direction direction,
900
+ const git_remote_callbacks *callbacks,
901
+ const git_proxy_options *proxy_opts,
902
+ const git_strarray *custom_headers);
903
+
904
+ /**
905
+ * Open a connection to a remote with extended options.
906
+ *
907
+ * The transport is selected based on the URL; the direction argument
908
+ * is due to a limitation of the git protocol which starts up a
909
+ * specific binary which can only do the one or the other.
910
+ *
911
+ * The given options structure will form the defaults for connection
912
+ * options and callback setup. Callers may override these defaults
913
+ * by specifying `git_fetch_options` or `git_push_options` in
914
+ * subsequent calls.
915
+ *
916
+ * @param remote the remote to connect to
917
+ * @param direction GIT_DIRECTION_FETCH if you want to fetch or
918
+ * GIT_DIRECTION_PUSH if you want to push
919
+ * @param opts the remote connection options
920
+ * @return 0 or an error code
921
+ */
922
+ GIT_EXTERN(int) git_remote_connect_ext(
923
+ git_remote *remote,
924
+ git_direction direction,
925
+ const git_remote_connect_options *opts);
926
+
927
+ /**
928
+ * Download and index the packfile.
813
929
  *
814
930
  * Connect to the remote if it hasn't been done yet, negotiate with
815
931
  * the remote git which objects are missing, download and index the
@@ -818,19 +934,31 @@ GIT_EXTERN(int) git_push_options_init(
818
934
  * The .idx file will be created and both it and the packfile with be
819
935
  * renamed to their final name.
820
936
  *
937
+ * If options are specified and this remote is already connected then
938
+ * the existing remote connection options will be discarded and the
939
+ * remote will now use the new options.
940
+ *
821
941
  * @param remote the remote
822
942
  * @param refspecs the refspecs to use for this negotiation and
823
943
  * download. Use NULL or an empty array to use the base refspecs
824
- * @param opts the options to use for this fetch
944
+ * @param opts the options to use for this fetch or NULL
825
945
  * @return 0 or an error code
826
946
  */
827
- GIT_EXTERN(int) git_remote_download(git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts);
947
+ GIT_EXTERN(int) git_remote_download(
948
+ git_remote *remote,
949
+ const git_strarray *refspecs,
950
+ const git_fetch_options *opts);
828
951
 
829
952
  /**
830
953
  * Create a packfile and send it to the server
831
954
  *
832
955
  * Connect to the remote if it hasn't been done yet, negotiate with
833
- * the remote git which objects are missing, create a packfile with the missing objects and send it.
956
+ * the remote git which objects are missing, create a packfile with
957
+ * the missing objects and send it.
958
+ *
959
+ * If options are specified and this remote is already connected then
960
+ * the existing remote connection options will be discarded and the
961
+ * remote will now use the new options.
834
962
  *
835
963
  * @param remote the remote
836
964
  * @param refspecs the refspecs to use for this negotiation and
@@ -838,17 +966,23 @@ GIT_EXTERN(int) git_push_options_init(
838
966
  * @param opts the options to use for this push
839
967
  * @return 0 or an error code
840
968
  */
841
- GIT_EXTERN(int) git_remote_upload(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts);
969
+ GIT_EXTERN(int) git_remote_upload(
970
+ git_remote *remote,
971
+ const git_strarray *refspecs,
972
+ const git_push_options *opts);
842
973
 
843
974
  /**
844
- * Update the tips to the new state
975
+ * Update the tips to the new state.
976
+ *
977
+ * If callbacks are not specified then the callbacks specified to
978
+ * `git_remote_connect` will be used (if it was called).
845
979
  *
846
980
  * @param remote the remote to update
847
981
  * @param reflog_message The message to insert into the reflogs. If
848
982
  * NULL and fetching, the default is "fetch <name>", where <name> is
849
983
  * the name of the remote (or its url, for in-memory remotes). This
850
984
  * parameter is ignored when pushing.
851
- * @param callbacks pointer to the callback structure to use
985
+ * @param callbacks pointer to the callback structure to use or NULL
852
986
  * @param update_fetchhead whether to write to FETCH_HEAD. Pass 1 to behave like git.
853
987
  * @param download_tags what the behaviour for downloading tags is for this fetch. This is
854
988
  * ignored for push. This must be the same value passed to `git_remote_download()`.
@@ -862,15 +996,19 @@ GIT_EXTERN(int) git_remote_update_tips(
862
996
  const char *reflog_message);
863
997
 
864
998
  /**
865
- * Download new data and update tips
999
+ * Download new data and update tips.
866
1000
  *
867
1001
  * Convenience function to connect to a remote, download the data,
868
1002
  * disconnect and update the remote-tracking branches.
869
1003
  *
1004
+ * If options are specified and this remote is already connected then
1005
+ * the existing remote connection options will be discarded and the
1006
+ * remote will now use the new options.
1007
+ *
870
1008
  * @param remote the remote to fetch from
871
1009
  * @param refspecs the refspecs to use for this fetch. Pass NULL or an
872
1010
  * empty array to use the base refspecs.
873
- * @param opts options to use for this fetch
1011
+ * @param opts options to use for this fetch or NULL
874
1012
  * @param reflog_message The message to insert into the reflogs. If NULL, the
875
1013
  * default is "fetch"
876
1014
  * @return 0 or an error code
@@ -882,27 +1020,36 @@ GIT_EXTERN(int) git_remote_fetch(
882
1020
  const char *reflog_message);
883
1021
 
884
1022
  /**
885
- * Prune tracking refs that are no longer present on remote
1023
+ * Prune tracking refs that are no longer present on remote.
1024
+ *
1025
+ * If callbacks are not specified then the callbacks specified to
1026
+ * `git_remote_connect` will be used (if it was called).
886
1027
  *
887
1028
  * @param remote the remote to prune
888
1029
  * @param callbacks callbacks to use for this prune
889
1030
  * @return 0 or an error code
890
1031
  */
891
- GIT_EXTERN(int) git_remote_prune(git_remote *remote, const git_remote_callbacks *callbacks);
1032
+ GIT_EXTERN(int) git_remote_prune(
1033
+ git_remote *remote,
1034
+ const git_remote_callbacks *callbacks);
892
1035
 
893
1036
  /**
894
- * Perform a push
1037
+ * Perform a push.
895
1038
  *
896
- * Peform all the steps from a push.
1039
+ * If options are specified and this remote is already connected then
1040
+ * the existing remote connection options will be discarded and the
1041
+ * remote will now use the new options.
897
1042
  *
898
1043
  * @param remote the remote to push to
899
1044
  * @param refspecs the refspecs to use for pushing. If NULL or an empty
900
1045
  * array, the configured refspecs will be used
901
1046
  * @param opts options to use for this push
1047
+ * @return 0 or an error code.
902
1048
  */
903
- GIT_EXTERN(int) git_remote_push(git_remote *remote,
904
- const git_strarray *refspecs,
905
- const git_push_options *opts);
1049
+ GIT_EXTERN(int) git_remote_push(
1050
+ git_remote *remote,
1051
+ const git_strarray *refspecs,
1052
+ const git_push_options *opts);
906
1053
 
907
1054
  /**
908
1055
  * Get the statistics structure that is filled in by the fetch operation.
@@ -141,7 +141,7 @@ typedef enum {
141
141
  * `git_repository_open_ext` with this flag will error out if either
142
142
  * $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
143
143
  */
144
- GIT_REPOSITORY_OPEN_FROM_ENV = (1 << 4),
144
+ GIT_REPOSITORY_OPEN_FROM_ENV = (1 << 4)
145
145
  } git_repository_open_flag_t;
146
146
 
147
147
  /**
@@ -267,7 +267,7 @@ typedef enum {
267
267
  * If an alternate workdir is specified, use relative paths for the gitdir
268
268
  * and core.worktree.
269
269
  */
270
- GIT_REPOSITORY_INIT_RELATIVE_GITLINK = (1u << 6),
270
+ GIT_REPOSITORY_INIT_RELATIVE_GITLINK = (1u << 6)
271
271
  } git_repository_init_flag_t;
272
272
 
273
273
  /**
@@ -292,7 +292,7 @@ typedef enum {
292
292
  /**
293
293
  * Use "--shared=all" behavior, adding world readability.
294
294
  */
295
- GIT_REPOSITORY_INIT_SHARED_ALL = 0002777,
295
+ GIT_REPOSITORY_INIT_SHARED_ALL = 0002777
296
296
  } git_repository_init_mode_t;
297
297
 
298
298
  /**
@@ -351,6 +351,15 @@ typedef struct {
351
351
  * pointing to this URL.
352
352
  */
353
353
  const char *origin_url;
354
+
355
+ #ifdef GIT_EXPERIMENTAL_SHA256
356
+ /**
357
+ *
358
+ * Type of object IDs to use for this repository, or 0 for
359
+ * default (currently SHA1).
360
+ */
361
+ git_oid_t oid_type;
362
+ #endif
354
363
  } git_repository_init_options;
355
364
 
356
365
  #define GIT_REPOSITORY_INIT_OPTIONS_VERSION 1
@@ -456,7 +465,9 @@ GIT_EXTERN(int) git_repository_head_unborn(git_repository *repo);
456
465
  * Check if a repository is empty
457
466
  *
458
467
  * An empty repository has just been initialized and contains no references
459
- * apart from HEAD, which must be pointing to the unborn master branch.
468
+ * apart from HEAD, which must be pointing to the unborn master branch,
469
+ * or the branch specified for the repository in the `init.defaultBranch`
470
+ * configuration variable.
460
471
  *
461
472
  * @param repo Repo to test
462
473
  * @return 1 if the repository is empty, 0 if it isn't, error code
@@ -673,6 +684,9 @@ GIT_EXTERN(int) git_repository_message(git_buf *out, git_repository *repo);
673
684
  * Remove git's prepared message.
674
685
  *
675
686
  * Remove the message that `git_repository_message` retrieves.
687
+ *
688
+ * @param repo Repository to remove prepared message from.
689
+ * @return 0 or an error code.
676
690
  */
677
691
  GIT_EXTERN(int) git_repository_message_remove(git_repository *repo);
678
692
 
@@ -808,19 +822,19 @@ GIT_EXTERN(int) git_repository_set_head(
808
822
  * If the provided committish cannot be found in the repository, the HEAD
809
823
  * is unaltered and GIT_ENOTFOUND is returned.
810
824
  *
811
- * If the provided commitish cannot be peeled into a commit, the HEAD
825
+ * If the provided committish cannot be peeled into a commit, the HEAD
812
826
  * is unaltered and -1 is returned.
813
827
  *
814
828
  * Otherwise, the HEAD will eventually be detached and will directly point to
815
829
  * the peeled Commit.
816
830
  *
817
831
  * @param repo Repository pointer
818
- * @param commitish Object id of the Commit the HEAD should point to
832
+ * @param committish Object id of the Commit the HEAD should point to
819
833
  * @return 0 on success, or an error code
820
834
  */
821
835
  GIT_EXTERN(int) git_repository_set_head_detached(
822
836
  git_repository *repo,
823
- const git_oid *commitish);
837
+ const git_oid *committish);
824
838
 
825
839
  /**
826
840
  * Make the repository HEAD directly point to the Commit.
@@ -836,7 +850,7 @@ GIT_EXTERN(int) git_repository_set_head_detached(
836
850
  */
837
851
  GIT_EXTERN(int) git_repository_set_head_detached_from_annotated(
838
852
  git_repository *repo,
839
- const git_annotated_commit *commitish);
853
+ const git_annotated_commit *committish);
840
854
 
841
855
  /**
842
856
  * Detach the HEAD.
@@ -846,7 +860,7 @@ GIT_EXTERN(int) git_repository_set_head_detached_from_annotated(
846
860
  * If the HEAD is already detached and points to a Tag, the HEAD is
847
861
  * updated into making it point to the peeled Commit, and 0 is returned.
848
862
  *
849
- * If the HEAD is already detached and points to a non commitish, the HEAD is
863
+ * If the HEAD is already detached and points to a non committish, the HEAD is
850
864
  * unaltered, and -1 is returned.
851
865
  *
852
866
  * Otherwise, the HEAD will be detached and point to the peeled Commit.
@@ -876,7 +890,7 @@ typedef enum {
876
890
  GIT_REPOSITORY_STATE_REBASE_INTERACTIVE,
877
891
  GIT_REPOSITORY_STATE_REBASE_MERGE,
878
892
  GIT_REPOSITORY_STATE_APPLY_MAILBOX,
879
- GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE,
893
+ GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE
880
894
  } git_repository_state_t;
881
895
 
882
896
  /**
@@ -928,6 +942,7 @@ GIT_EXTERN(int) git_repository_is_shallow(git_repository *repo);
928
942
  * @param name where to store the pointer to the name
929
943
  * @param email where to store the pointer to the email
930
944
  * @param repo the repository
945
+ * @return 0 or an error code
931
946
  */
932
947
  GIT_EXTERN(int) git_repository_ident(const char **name, const char **email, const git_repository *repo);
933
948
 
@@ -941,9 +956,18 @@ GIT_EXTERN(int) git_repository_ident(const char **name, const char **email, cons
941
956
  * @param repo the repository to configure
942
957
  * @param name the name to use for the reflog entries
943
958
  * @param email the email to use for the reflog entries
959
+ * @return 0 or an error code.
944
960
  */
945
961
  GIT_EXTERN(int) git_repository_set_ident(git_repository *repo, const char *name, const char *email);
946
962
 
963
+ /**
964
+ * Gets the object type used by this repository.
965
+ *
966
+ * @param repo the repository
967
+ * @return the object id type
968
+ */
969
+ GIT_EXTERN(git_oid_t) git_repository_oid_type(git_repository *repo);
970
+
947
971
  /** @} */
948
972
  GIT_END_DECL
949
973
  #endif
@@ -26,7 +26,7 @@ GIT_BEGIN_DECL
26
26
  typedef enum {
27
27
  GIT_RESET_SOFT = 1, /**< Move the head to the given commit */
28
28
  GIT_RESET_MIXED = 2, /**< SOFT plus reset index to the commit */
29
- GIT_RESET_HARD = 3, /**< MIXED plus changes in working tree discarded */
29
+ GIT_RESET_HARD = 3 /**< MIXED plus changes in working tree discarded */
30
30
  } git_reset_t;
31
31
 
32
32
  /**
@@ -48,7 +48,7 @@ typedef enum {
48
48
  *
49
49
  * @param target Committish to which the Head should be moved to. This object
50
50
  * must belong to the given `repo` and can either be a git_commit or a
51
- * git_tag. When a git_tag is being passed, it should be dereferencable
51
+ * git_tag. When a git_tag is being passed, it should be dereferenceable
52
52
  * to a git_commit which oid will be used as the target of the branch.
53
53
  *
54
54
  * @param reset_type Kind of reset operation to perform.
@@ -74,7 +74,7 @@ typedef enum {
74
74
  /** The spec targeted a range of commits. */
75
75
  GIT_REVSPEC_RANGE = 1 << 1,
76
76
  /** The spec used the '...' operator, which invokes special semantics. */
77
- GIT_REVSPEC_MERGE_BASE = 1 << 2,
77
+ GIT_REVSPEC_MERGE_BASE = 1 << 2
78
78
  } git_revspec_t;
79
79
 
80
80
  /**
@@ -49,7 +49,7 @@ typedef enum {
49
49
  * order; this sorting mode can be combined with
50
50
  * any of the above.
51
51
  */
52
- GIT_SORT_REVERSE = 1 << 2,
52
+ GIT_SORT_REVERSE = 1 << 2
53
53
  } git_sort_t;
54
54
 
55
55
  /**
@@ -249,6 +249,7 @@ GIT_EXTERN(int) git_revwalk_push_range(git_revwalk *walk, const char *range);
249
249
  *
250
250
  * No parents other than the first for each commit will be enqueued.
251
251
  *
252
+ * @param walk The revision walker.
252
253
  * @return 0 or an error code
253
254
  */
254
255
  GIT_EXTERN(int) git_revwalk_simplify_first_parent(git_revwalk *walk);
@@ -277,6 +278,7 @@ GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk);
277
278
  *
278
279
  * @param commit_id oid of Commit
279
280
  * @param payload User-specified pointer to data to be passed as data payload
281
+ * @return non-zero to hide the commmit and it parent.
280
282
  */
281
283
  typedef int GIT_CALLBACK(git_revwalk_hide_cb)(
282
284
  const git_oid *commit_id,
@@ -288,6 +290,7 @@ typedef int GIT_CALLBACK(git_revwalk_hide_cb)(
288
290
  * @param walk the revision walker
289
291
  * @param hide_cb callback function to hide a commit and its parents
290
292
  * @param payload data payload to be passed to callback function
293
+ * @return 0 or an error code.
291
294
  */
292
295
  GIT_EXTERN(int) git_revwalk_add_hide_cb(
293
296
  git_revwalk *walk,
@@ -71,7 +71,7 @@ GIT_EXTERN(int) git_signature_default(git_signature **out, git_repository *repo)
71
71
  *
72
72
  * @param out new signature
73
73
  * @param buf signature string
74
- * @return 0 on success, or an error code
74
+ * @return 0 on success, GIT_EINVALID if the signature is not parseable, or an error code
75
75
  */
76
76
  GIT_EXTERN(int) git_signature_from_buffer(git_signature **out, const char *buf);
77
77