rugged 0.19.0 → 0.28.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (668) hide show
  1. checksums.yaml +7 -0
  2. data/LICENSE +1 -1
  3. data/README.md +184 -33
  4. data/ext/rugged/extconf.rb +111 -28
  5. data/ext/rugged/rugged.c +327 -89
  6. data/ext/rugged/rugged.h +64 -28
  7. data/ext/rugged/rugged_allocator.c +89 -0
  8. data/ext/rugged/rugged_backend.c +17 -0
  9. data/ext/rugged/rugged_blame.c +278 -0
  10. data/ext/rugged/rugged_blob.c +301 -75
  11. data/ext/rugged/rugged_branch.c +92 -242
  12. data/ext/rugged/rugged_branch_collection.c +388 -0
  13. data/ext/rugged/rugged_commit.c +575 -79
  14. data/ext/rugged/rugged_config.c +129 -36
  15. data/ext/rugged/rugged_cred.c +131 -0
  16. data/ext/rugged/rugged_diff.c +291 -122
  17. data/ext/rugged/rugged_diff_delta.c +16 -22
  18. data/ext/rugged/rugged_diff_hunk.c +35 -51
  19. data/ext/rugged/rugged_diff_line.c +23 -36
  20. data/ext/rugged/rugged_index.c +289 -152
  21. data/ext/rugged/rugged_note.c +50 -60
  22. data/ext/rugged/rugged_object.c +13 -30
  23. data/ext/rugged/rugged_patch.c +400 -0
  24. data/ext/rugged/rugged_rebase.c +397 -0
  25. data/ext/rugged/rugged_reference.c +76 -346
  26. data/ext/rugged/rugged_reference_collection.c +423 -0
  27. data/ext/rugged/rugged_remote.c +438 -461
  28. data/ext/rugged/rugged_remote_collection.c +435 -0
  29. data/ext/rugged/rugged_repo.c +1548 -365
  30. data/ext/rugged/rugged_revwalk.c +378 -99
  31. data/ext/rugged/rugged_settings.c +86 -23
  32. data/ext/rugged/rugged_signature.c +47 -37
  33. data/ext/rugged/rugged_submodule.c +835 -0
  34. data/ext/rugged/rugged_submodule_collection.c +366 -0
  35. data/ext/rugged/rugged_tag.c +88 -210
  36. data/ext/rugged/rugged_tag_collection.c +326 -0
  37. data/ext/rugged/rugged_tree.c +460 -217
  38. data/lib/rugged/attributes.rb +46 -0
  39. data/lib/rugged/blob.rb +33 -0
  40. data/lib/rugged/branch.rb +12 -16
  41. data/lib/rugged/commit.rb +9 -0
  42. data/lib/rugged/console.rb +5 -0
  43. data/lib/rugged/credentials.rb +48 -0
  44. data/lib/rugged/diff/delta.rb +6 -2
  45. data/lib/rugged/diff/hunk.rb +9 -9
  46. data/lib/rugged/diff/line.rb +28 -5
  47. data/lib/rugged/diff.rb +7 -1
  48. data/lib/rugged/index.rb +120 -0
  49. data/lib/rugged/object.rb +5 -0
  50. data/lib/rugged/patch.rb +41 -0
  51. data/lib/rugged/reference.rb +6 -3
  52. data/lib/rugged/remote.rb +5 -9
  53. data/lib/rugged/repository.rb +126 -14
  54. data/lib/rugged/submodule_collection.rb +53 -0
  55. data/lib/rugged/tag.rb +45 -16
  56. data/lib/rugged/tree.rb +163 -1
  57. data/lib/rugged/version.rb +6 -1
  58. data/lib/rugged/walker.rb +5 -0
  59. data/lib/rugged.rb +16 -1
  60. data/vendor/libgit2/AUTHORS +77 -0
  61. data/vendor/libgit2/CMakeLists.txt +317 -0
  62. data/vendor/libgit2/COPYING +993 -0
  63. data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +30 -0
  64. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
  65. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
  66. data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +11 -0
  67. data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +26 -0
  68. data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
  69. data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
  70. data/vendor/libgit2/cmake/Modules/FindIconv.cmake +45 -0
  71. data/vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake +28 -0
  72. data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +28 -0
  73. data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +20 -0
  74. data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
  75. data/vendor/libgit2/cmake/Modules/IdeSplitSources.cmake +22 -0
  76. data/vendor/libgit2/deps/http-parser/CMakeLists.txt +5 -0
  77. data/vendor/libgit2/deps/http-parser/COPYING +23 -0
  78. data/vendor/libgit2/deps/http-parser/http_parser.c +5 -2
  79. data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
  80. data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
  81. data/vendor/libgit2/deps/regex/COPYING +502 -0
  82. data/vendor/libgit2/deps/regex/regex.c +10 -3
  83. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +26 -0
  84. data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
  85. data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
  86. data/vendor/libgit2/deps/winhttp/urlmon.h +45 -0
  87. data/vendor/libgit2/deps/winhttp/winhttp.def +29 -0
  88. data/vendor/libgit2/deps/winhttp/winhttp.h +594 -0
  89. data/vendor/libgit2/deps/winhttp/winhttp64.def +29 -0
  90. data/vendor/libgit2/deps/zlib/CMakeLists.txt +5 -0
  91. data/vendor/libgit2/deps/zlib/COPYING +27 -0
  92. data/vendor/libgit2/deps/zlib/adler32.c +51 -34
  93. data/vendor/libgit2/deps/zlib/crc32.c +61 -61
  94. data/vendor/libgit2/deps/zlib/crc32.h +1 -1
  95. data/vendor/libgit2/deps/zlib/deflate.c +681 -352
  96. data/vendor/libgit2/deps/zlib/deflate.h +25 -18
  97. data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
  98. data/vendor/libgit2/deps/zlib/infback.c +640 -0
  99. data/vendor/libgit2/deps/zlib/inffast.c +36 -53
  100. data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
  101. data/vendor/libgit2/deps/zlib/inflate.c +167 -86
  102. data/vendor/libgit2/deps/zlib/inflate.h +7 -4
  103. data/vendor/libgit2/deps/zlib/inftrees.c +24 -50
  104. data/vendor/libgit2/deps/zlib/trees.c +55 -96
  105. data/vendor/libgit2/deps/zlib/zconf.h +499 -19
  106. data/vendor/libgit2/deps/zlib/zlib.h +526 -227
  107. data/vendor/libgit2/deps/zlib/zutil.c +39 -32
  108. data/vendor/libgit2/deps/zlib/zutil.h +75 -78
  109. data/vendor/libgit2/include/git2/annotated_commit.h +125 -0
  110. data/vendor/libgit2/include/git2/apply.h +129 -0
  111. data/vendor/libgit2/include/git2/attr.h +36 -21
  112. data/vendor/libgit2/include/git2/blame.h +229 -0
  113. data/vendor/libgit2/include/git2/blob.h +81 -44
  114. data/vendor/libgit2/include/git2/branch.h +81 -42
  115. data/vendor/libgit2/include/git2/buffer.h +128 -0
  116. data/vendor/libgit2/include/git2/checkout.h +141 -67
  117. data/vendor/libgit2/include/git2/cherrypick.h +92 -0
  118. data/vendor/libgit2/include/git2/clone.h +157 -58
  119. data/vendor/libgit2/include/git2/commit.h +231 -12
  120. data/vendor/libgit2/include/git2/common.h +216 -30
  121. data/vendor/libgit2/include/git2/config.h +274 -48
  122. data/vendor/libgit2/include/git2/cred_helpers.h +4 -4
  123. data/vendor/libgit2/include/git2/deprecated.h +253 -0
  124. data/vendor/libgit2/include/git2/describe.h +189 -0
  125. data/vendor/libgit2/include/git2/diff.h +985 -575
  126. data/vendor/libgit2/include/git2/errors.h +93 -52
  127. data/vendor/libgit2/include/git2/filter.h +217 -0
  128. data/vendor/libgit2/include/git2/global.h +44 -0
  129. data/vendor/libgit2/include/git2/graph.h +17 -0
  130. data/vendor/libgit2/include/git2/ignore.h +2 -2
  131. data/vendor/libgit2/include/git2/index.h +269 -94
  132. data/vendor/libgit2/include/git2/indexer.h +44 -12
  133. data/vendor/libgit2/include/git2/mailmap.h +115 -0
  134. data/vendor/libgit2/include/git2/merge.h +501 -64
  135. data/vendor/libgit2/include/git2/message.h +52 -17
  136. data/vendor/libgit2/include/git2/net.h +11 -5
  137. data/vendor/libgit2/include/git2/notes.h +120 -16
  138. data/vendor/libgit2/include/git2/object.h +62 -23
  139. data/vendor/libgit2/include/git2/odb.h +140 -24
  140. data/vendor/libgit2/include/git2/odb_backend.h +56 -12
  141. data/vendor/libgit2/include/git2/oid.h +17 -18
  142. data/vendor/libgit2/include/git2/oidarray.h +40 -0
  143. data/vendor/libgit2/include/git2/pack.h +86 -7
  144. data/vendor/libgit2/include/git2/patch.h +274 -0
  145. data/vendor/libgit2/include/git2/pathspec.h +280 -0
  146. data/vendor/libgit2/include/git2/proxy.h +96 -0
  147. data/vendor/libgit2/include/git2/rebase.h +323 -0
  148. data/vendor/libgit2/include/git2/reflog.h +12 -9
  149. data/vendor/libgit2/include/git2/refs.h +241 -46
  150. data/vendor/libgit2/include/git2/refspec.h +20 -4
  151. data/vendor/libgit2/include/git2/remote.h +636 -209
  152. data/vendor/libgit2/include/git2/repository.h +267 -57
  153. data/vendor/libgit2/include/git2/reset.h +36 -6
  154. data/vendor/libgit2/include/git2/revert.h +91 -0
  155. data/vendor/libgit2/include/git2/revparse.h +27 -16
  156. data/vendor/libgit2/include/git2/revwalk.h +78 -35
  157. data/vendor/libgit2/include/git2/signature.h +32 -5
  158. data/vendor/libgit2/include/git2/stash.h +160 -21
  159. data/vendor/libgit2/include/git2/status.h +92 -30
  160. data/vendor/libgit2/include/git2/submodule.h +226 -133
  161. data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
  162. data/vendor/libgit2/include/git2/sys/commit.h +38 -4
  163. data/vendor/libgit2/include/git2/sys/config.h +68 -9
  164. data/vendor/libgit2/include/git2/sys/diff.h +94 -0
  165. data/vendor/libgit2/include/git2/sys/filter.h +332 -0
  166. data/vendor/libgit2/include/git2/sys/hashsig.h +106 -0
  167. data/vendor/libgit2/include/git2/sys/index.h +6 -5
  168. data/vendor/libgit2/include/git2/sys/mempack.h +86 -0
  169. data/vendor/libgit2/include/git2/sys/merge.h +182 -0
  170. data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -28
  171. data/vendor/libgit2/include/git2/sys/openssl.h +38 -0
  172. data/vendor/libgit2/include/git2/sys/path.h +64 -0
  173. data/vendor/libgit2/include/git2/sys/refdb_backend.h +79 -19
  174. data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
  175. data/vendor/libgit2/include/git2/sys/refs.h +13 -2
  176. data/vendor/libgit2/include/git2/sys/repository.h +64 -1
  177. data/vendor/libgit2/include/git2/sys/stream.h +138 -0
  178. data/vendor/libgit2/include/git2/sys/time.h +31 -0
  179. data/vendor/libgit2/include/git2/sys/transport.h +439 -0
  180. data/vendor/libgit2/include/git2/tag.h +11 -2
  181. data/vendor/libgit2/include/git2/trace.h +1 -1
  182. data/vendor/libgit2/include/git2/transaction.h +121 -0
  183. data/vendor/libgit2/include/git2/transport.h +261 -292
  184. data/vendor/libgit2/include/git2/tree.h +111 -21
  185. data/vendor/libgit2/include/git2/types.h +244 -32
  186. data/vendor/libgit2/include/git2/version.h +5 -2
  187. data/vendor/libgit2/include/git2/worktree.h +255 -0
  188. data/vendor/libgit2/include/git2.h +50 -40
  189. data/vendor/libgit2/libgit2.pc.in +13 -0
  190. data/vendor/libgit2/src/CMakeLists.txt +525 -0
  191. data/vendor/libgit2/src/alloc.c +55 -0
  192. data/vendor/libgit2/src/alloc.h +40 -0
  193. data/vendor/libgit2/src/annotated_commit.c +228 -0
  194. data/vendor/libgit2/src/annotated_commit.h +52 -0
  195. data/vendor/libgit2/src/apply.c +855 -0
  196. data/vendor/libgit2/src/apply.h +25 -0
  197. data/vendor/libgit2/src/array.h +74 -16
  198. data/vendor/libgit2/src/attr.c +239 -408
  199. data/vendor/libgit2/src/attr.h +3 -33
  200. data/vendor/libgit2/src/attr_file.c +424 -156
  201. data/vendor/libgit2/src/attr_file.h +95 -23
  202. data/vendor/libgit2/src/attrcache.c +469 -0
  203. data/vendor/libgit2/src/attrcache.h +37 -5
  204. data/vendor/libgit2/src/bitvec.h +75 -0
  205. data/vendor/libgit2/src/blame.c +532 -0
  206. data/vendor/libgit2/src/blame.h +95 -0
  207. data/vendor/libgit2/src/blame_git.c +668 -0
  208. data/vendor/libgit2/src/blame_git.h +22 -0
  209. data/vendor/libgit2/src/blob.c +233 -129
  210. data/vendor/libgit2/src/blob.h +29 -1
  211. data/vendor/libgit2/src/branch.c +295 -197
  212. data/vendor/libgit2/src/branch.h +2 -0
  213. data/vendor/libgit2/src/buf_text.c +52 -27
  214. data/vendor/libgit2/src/buf_text.h +7 -7
  215. data/vendor/libgit2/src/buffer.c +609 -52
  216. data/vendor/libgit2/src/buffer.h +68 -23
  217. data/vendor/libgit2/src/cache.c +48 -51
  218. data/vendor/libgit2/src/cache.h +6 -4
  219. data/vendor/libgit2/src/cc-compat.h +35 -7
  220. data/vendor/libgit2/src/checkout.c +1827 -483
  221. data/vendor/libgit2/src/checkout.h +4 -1
  222. data/vendor/libgit2/src/cherrypick.c +230 -0
  223. data/vendor/libgit2/src/clone.c +338 -258
  224. data/vendor/libgit2/src/{compress.h → clone.h} +5 -5
  225. data/vendor/libgit2/src/commit.c +711 -124
  226. data/vendor/libgit2/src/commit.h +10 -3
  227. data/vendor/libgit2/src/commit_list.c +21 -14
  228. data/vendor/libgit2/src/commit_list.h +9 -3
  229. data/vendor/libgit2/src/common.h +153 -13
  230. data/vendor/libgit2/src/config.c +871 -242
  231. data/vendor/libgit2/src/config.h +58 -14
  232. data/vendor/libgit2/src/config_backend.h +84 -0
  233. data/vendor/libgit2/src/config_cache.c +44 -18
  234. data/vendor/libgit2/src/config_entries.c +259 -0
  235. data/vendor/libgit2/src/config_entries.h +23 -0
  236. data/vendor/libgit2/src/config_file.c +837 -1113
  237. data/vendor/libgit2/src/config_mem.c +224 -0
  238. data/vendor/libgit2/src/config_parse.c +558 -0
  239. data/vendor/libgit2/src/config_parse.h +64 -0
  240. data/vendor/libgit2/src/crlf.c +290 -195
  241. data/vendor/libgit2/src/date.c +35 -7
  242. data/vendor/libgit2/src/delta.c +275 -71
  243. data/vendor/libgit2/src/delta.h +80 -58
  244. data/vendor/libgit2/src/describe.c +893 -0
  245. data/vendor/libgit2/src/diff.c +330 -1128
  246. data/vendor/libgit2/src/diff.h +25 -67
  247. data/vendor/libgit2/src/diff_driver.c +225 -109
  248. data/vendor/libgit2/src/diff_driver.h +5 -2
  249. data/vendor/libgit2/src/diff_file.c +128 -103
  250. data/vendor/libgit2/src/diff_file.h +17 -12
  251. data/vendor/libgit2/src/diff_generate.c +1622 -0
  252. data/vendor/libgit2/src/diff_generate.h +128 -0
  253. data/vendor/libgit2/src/diff_parse.c +108 -0
  254. data/vendor/libgit2/src/diff_parse.h +20 -0
  255. data/vendor/libgit2/src/diff_print.c +578 -218
  256. data/vendor/libgit2/src/diff_stats.c +362 -0
  257. data/vendor/libgit2/src/diff_tform.c +429 -257
  258. data/vendor/libgit2/src/diff_tform.h +25 -0
  259. data/vendor/libgit2/src/diff_xdiff.c +143 -46
  260. data/vendor/libgit2/src/diff_xdiff.h +12 -5
  261. data/vendor/libgit2/src/errors.c +150 -34
  262. data/vendor/libgit2/src/features.h.in +37 -0
  263. data/vendor/libgit2/src/fetch.c +69 -46
  264. data/vendor/libgit2/src/fetch.h +6 -12
  265. data/vendor/libgit2/src/fetchhead.c +40 -33
  266. data/vendor/libgit2/src/fetchhead.h +5 -4
  267. data/vendor/libgit2/src/filebuf.c +163 -61
  268. data/vendor/libgit2/src/filebuf.h +13 -7
  269. data/vendor/libgit2/src/fileops.c +549 -407
  270. data/vendor/libgit2/src/fileops.h +97 -106
  271. data/vendor/libgit2/src/filter.c +989 -46
  272. data/vendor/libgit2/src/filter.h +21 -70
  273. data/vendor/libgit2/src/fnmatch.c +67 -11
  274. data/vendor/libgit2/src/fnmatch.h +27 -7
  275. data/vendor/libgit2/src/global.c +257 -63
  276. data/vendor/libgit2/src/global.h +19 -0
  277. data/vendor/libgit2/src/graph.c +39 -23
  278. data/vendor/libgit2/src/hash/hash_collisiondetect.h +51 -0
  279. data/vendor/libgit2/src/hash/hash_common_crypto.h +61 -0
  280. data/vendor/libgit2/src/hash/hash_generic.c +3 -3
  281. data/vendor/libgit2/src/hash/hash_generic.h +10 -5
  282. data/vendor/libgit2/src/hash/hash_mbedtls.c +38 -0
  283. data/vendor/libgit2/src/hash/hash_mbedtls.h +24 -0
  284. data/vendor/libgit2/src/hash/hash_openssl.h +26 -8
  285. data/vendor/libgit2/src/hash/hash_win32.c +71 -43
  286. data/vendor/libgit2/src/hash/hash_win32.h +4 -3
  287. data/vendor/libgit2/src/hash/sha1dc/sha1.c +1900 -0
  288. data/vendor/libgit2/src/hash/sha1dc/sha1.h +110 -0
  289. data/vendor/libgit2/src/hash/sha1dc/ubc_check.c +372 -0
  290. data/vendor/libgit2/src/hash/sha1dc/ubc_check.h +52 -0
  291. data/vendor/libgit2/src/hash.c +0 -1
  292. data/vendor/libgit2/src/hash.h +13 -6
  293. data/vendor/libgit2/src/hashsig.c +121 -126
  294. data/vendor/libgit2/src/ident.c +129 -0
  295. data/vendor/libgit2/src/idxmap.c +153 -0
  296. data/vendor/libgit2/src/idxmap.h +41 -0
  297. data/vendor/libgit2/src/ignore.c +362 -123
  298. data/vendor/libgit2/src/ignore.h +16 -4
  299. data/vendor/libgit2/src/index.c +2131 -692
  300. data/vendor/libgit2/src/index.h +138 -6
  301. data/vendor/libgit2/src/indexer.c +866 -266
  302. data/vendor/libgit2/src/indexer.h +16 -0
  303. data/vendor/libgit2/src/integer.h +106 -0
  304. data/vendor/libgit2/src/iterator.c +1888 -967
  305. data/vendor/libgit2/src/iterator.h +130 -67
  306. data/vendor/libgit2/src/khash.h +43 -29
  307. data/vendor/libgit2/src/mailmap.c +485 -0
  308. data/vendor/libgit2/src/mailmap.h +35 -0
  309. data/vendor/libgit2/src/map.h +1 -1
  310. data/vendor/libgit2/src/merge.c +1679 -479
  311. data/vendor/libgit2/src/merge.h +89 -22
  312. data/vendor/libgit2/src/merge_driver.c +426 -0
  313. data/vendor/libgit2/src/merge_driver.h +62 -0
  314. data/vendor/libgit2/src/merge_file.c +238 -101
  315. data/vendor/libgit2/src/message.c +4 -28
  316. data/vendor/libgit2/src/message.h +3 -1
  317. data/vendor/libgit2/src/mwindow.c +123 -15
  318. data/vendor/libgit2/src/mwindow.h +10 -1
  319. data/vendor/libgit2/src/netops.c +178 -499
  320. data/vendor/libgit2/src/netops.h +51 -27
  321. data/vendor/libgit2/src/notes.c +251 -94
  322. data/vendor/libgit2/src/notes.h +5 -2
  323. data/vendor/libgit2/src/object.c +253 -67
  324. data/vendor/libgit2/src/object.h +40 -2
  325. data/vendor/libgit2/src/object_api.c +30 -11
  326. data/vendor/libgit2/src/odb.c +765 -201
  327. data/vendor/libgit2/src/odb.h +40 -8
  328. data/vendor/libgit2/src/odb_loose.c +560 -346
  329. data/vendor/libgit2/src/odb_mempack.c +185 -0
  330. data/vendor/libgit2/src/odb_pack.c +117 -73
  331. data/vendor/libgit2/src/offmap.c +113 -0
  332. data/vendor/libgit2/src/offmap.h +32 -42
  333. data/vendor/libgit2/src/oid.c +45 -25
  334. data/vendor/libgit2/src/oid.h +26 -8
  335. data/vendor/libgit2/src/oidarray.c +34 -0
  336. data/vendor/libgit2/src/oidarray.h +20 -0
  337. data/vendor/libgit2/src/oidmap.c +125 -0
  338. data/vendor/libgit2/src/oidmap.h +30 -17
  339. data/vendor/libgit2/src/pack-objects.c +688 -265
  340. data/vendor/libgit2/src/pack-objects.h +27 -13
  341. data/vendor/libgit2/src/pack.c +418 -202
  342. data/vendor/libgit2/src/pack.h +25 -16
  343. data/vendor/libgit2/src/parse.c +124 -0
  344. data/vendor/libgit2/src/parse.h +61 -0
  345. data/vendor/libgit2/src/patch.c +223 -0
  346. data/vendor/libgit2/src/patch.h +68 -0
  347. data/vendor/libgit2/src/patch_generate.c +901 -0
  348. data/vendor/libgit2/src/patch_generate.h +69 -0
  349. data/vendor/libgit2/src/patch_parse.c +1136 -0
  350. data/vendor/libgit2/src/patch_parse.h +51 -0
  351. data/vendor/libgit2/src/path.c +1247 -241
  352. data/vendor/libgit2/src/path.h +353 -57
  353. data/vendor/libgit2/src/pathspec.c +586 -58
  354. data/vendor/libgit2/src/pathspec.h +37 -15
  355. data/vendor/libgit2/src/pool.c +134 -221
  356. data/vendor/libgit2/src/pool.h +38 -50
  357. data/vendor/libgit2/src/posix.c +76 -10
  358. data/vendor/libgit2/src/posix.h +74 -32
  359. data/vendor/libgit2/src/pqueue.c +79 -117
  360. data/vendor/libgit2/src/pqueue.h +38 -82
  361. data/vendor/libgit2/src/proxy.c +39 -0
  362. data/vendor/libgit2/src/proxy.h +17 -0
  363. data/vendor/libgit2/src/push.c +178 -279
  364. data/vendor/libgit2/src/push.h +93 -4
  365. data/vendor/libgit2/src/reader.c +265 -0
  366. data/vendor/libgit2/src/reader.h +107 -0
  367. data/vendor/libgit2/src/rebase.c +1364 -0
  368. data/vendor/libgit2/src/refdb.c +74 -19
  369. data/vendor/libgit2/src/refdb.h +16 -3
  370. data/vendor/libgit2/src/refdb_fs.c +1472 -603
  371. data/vendor/libgit2/src/refdb_fs.h +4 -0
  372. data/vendor/libgit2/src/reflog.c +40 -330
  373. data/vendor/libgit2/src/reflog.h +8 -2
  374. data/vendor/libgit2/src/refs.c +641 -225
  375. data/vendor/libgit2/src/refs.h +53 -6
  376. data/vendor/libgit2/src/refspec.c +175 -62
  377. data/vendor/libgit2/src/refspec.h +10 -25
  378. data/vendor/libgit2/src/remote.c +1741 -723
  379. data/vendor/libgit2/src/remote.h +17 -5
  380. data/vendor/libgit2/src/repository.c +1505 -421
  381. data/vendor/libgit2/src/repository.h +95 -15
  382. data/vendor/libgit2/src/reset.c +63 -26
  383. data/vendor/libgit2/src/revert.c +232 -0
  384. data/vendor/libgit2/src/revparse.c +94 -80
  385. data/vendor/libgit2/src/revwalk.c +427 -194
  386. data/vendor/libgit2/src/revwalk.h +14 -5
  387. data/vendor/libgit2/src/settings.c +290 -0
  388. data/vendor/libgit2/src/sha1_lookup.c +16 -159
  389. data/vendor/libgit2/src/sha1_lookup.h +5 -4
  390. data/vendor/libgit2/src/signature.c +138 -26
  391. data/vendor/libgit2/src/signature.h +5 -0
  392. data/vendor/libgit2/src/sortedcache.c +395 -0
  393. data/vendor/libgit2/src/sortedcache.h +180 -0
  394. data/vendor/libgit2/src/stash.c +629 -168
  395. data/vendor/libgit2/src/status.c +125 -75
  396. data/vendor/libgit2/src/status.h +4 -2
  397. data/vendor/libgit2/src/stdalloc.c +120 -0
  398. data/vendor/libgit2/src/stdalloc.h +17 -0
  399. data/vendor/libgit2/src/stream.h +86 -0
  400. data/vendor/libgit2/src/streams/mbedtls.c +483 -0
  401. data/vendor/libgit2/src/streams/mbedtls.h +23 -0
  402. data/vendor/libgit2/src/streams/openssl.c +789 -0
  403. data/vendor/libgit2/src/streams/openssl.h +23 -0
  404. data/vendor/libgit2/src/streams/registry.c +118 -0
  405. data/vendor/libgit2/src/streams/registry.h +19 -0
  406. data/vendor/libgit2/src/streams/socket.c +235 -0
  407. data/vendor/libgit2/src/streams/socket.h +23 -0
  408. data/vendor/libgit2/src/streams/stransport.c +323 -0
  409. data/vendor/libgit2/src/streams/stransport.h +21 -0
  410. data/vendor/libgit2/src/streams/tls.c +73 -0
  411. data/vendor/libgit2/src/streams/tls.h +31 -0
  412. data/vendor/libgit2/src/strmap.c +147 -0
  413. data/vendor/libgit2/src/strmap.h +46 -51
  414. data/vendor/libgit2/src/strnlen.h +24 -0
  415. data/vendor/libgit2/src/submodule.c +1633 -877
  416. data/vendor/libgit2/src/submodule.h +83 -21
  417. data/vendor/libgit2/src/sysdir.c +355 -0
  418. data/vendor/libgit2/src/sysdir.h +119 -0
  419. data/vendor/libgit2/src/tag.c +87 -62
  420. data/vendor/libgit2/src/tag.h +4 -1
  421. data/vendor/libgit2/src/thread-utils.c +3 -0
  422. data/vendor/libgit2/src/thread-utils.h +71 -35
  423. data/vendor/libgit2/src/trace.c +4 -4
  424. data/vendor/libgit2/src/trace.h +11 -3
  425. data/vendor/libgit2/src/trailer.c +416 -0
  426. data/vendor/libgit2/src/transaction.c +382 -0
  427. data/vendor/libgit2/src/transaction.h +14 -0
  428. data/vendor/libgit2/src/transport.c +133 -67
  429. data/vendor/libgit2/src/transports/auth.c +75 -0
  430. data/vendor/libgit2/src/transports/auth.h +64 -0
  431. data/vendor/libgit2/src/transports/auth_negotiate.c +277 -0
  432. data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
  433. data/vendor/libgit2/src/transports/cred.c +296 -68
  434. data/vendor/libgit2/src/transports/cred.h +16 -0
  435. data/vendor/libgit2/src/transports/cred_helpers.c +4 -0
  436. data/vendor/libgit2/src/transports/git.c +108 -90
  437. data/vendor/libgit2/src/transports/http.c +803 -258
  438. data/vendor/libgit2/src/transports/http.h +25 -0
  439. data/vendor/libgit2/src/transports/local.c +265 -169
  440. data/vendor/libgit2/src/transports/smart.c +255 -45
  441. data/vendor/libgit2/src/transports/smart.h +42 -22
  442. data/vendor/libgit2/src/transports/smart_pkt.c +250 -159
  443. data/vendor/libgit2/src/transports/smart_protocol.c +414 -196
  444. data/vendor/libgit2/src/transports/ssh.c +645 -236
  445. data/vendor/libgit2/src/transports/ssh.h +14 -0
  446. data/vendor/libgit2/src/transports/winhttp.c +809 -353
  447. data/vendor/libgit2/src/tree-cache.c +138 -52
  448. data/vendor/libgit2/src/tree-cache.h +14 -7
  449. data/vendor/libgit2/src/tree.c +620 -259
  450. data/vendor/libgit2/src/tree.h +12 -19
  451. data/vendor/libgit2/src/tsort.c +3 -2
  452. data/vendor/libgit2/src/unix/map.c +25 -7
  453. data/vendor/libgit2/src/unix/posix.h +77 -12
  454. data/vendor/libgit2/src/unix/pthread.h +56 -0
  455. data/vendor/libgit2/src/unix/realpath.c +12 -8
  456. data/vendor/libgit2/src/userdiff.h +208 -0
  457. data/vendor/libgit2/src/util.c +349 -165
  458. data/vendor/libgit2/src/util.h +167 -85
  459. data/vendor/libgit2/src/varint.c +43 -0
  460. data/vendor/libgit2/src/varint.h +17 -0
  461. data/vendor/libgit2/src/vector.c +156 -33
  462. data/vendor/libgit2/src/vector.h +41 -5
  463. data/vendor/libgit2/src/win32/dir.c +22 -42
  464. data/vendor/libgit2/src/win32/dir.h +7 -5
  465. data/vendor/libgit2/src/win32/error.c +6 -32
  466. data/vendor/libgit2/src/win32/error.h +4 -2
  467. data/vendor/libgit2/src/win32/findfile.c +62 -69
  468. data/vendor/libgit2/src/win32/findfile.h +5 -13
  469. data/vendor/libgit2/src/win32/git2.rc +44 -0
  470. data/vendor/libgit2/src/win32/map.c +39 -11
  471. data/vendor/libgit2/src/win32/mingw-compat.h +10 -11
  472. data/vendor/libgit2/src/win32/msvc-compat.h +10 -33
  473. data/vendor/libgit2/src/win32/path_w32.c +476 -0
  474. data/vendor/libgit2/src/win32/path_w32.h +104 -0
  475. data/vendor/libgit2/src/win32/posix.h +35 -30
  476. data/vendor/libgit2/src/win32/posix_w32.c +659 -327
  477. data/vendor/libgit2/src/win32/precompiled.h +7 -2
  478. data/vendor/libgit2/src/win32/reparse.h +57 -0
  479. data/vendor/libgit2/src/win32/thread.c +258 -0
  480. data/vendor/libgit2/src/win32/thread.h +64 -0
  481. data/vendor/libgit2/src/win32/utf-conv.c +127 -62
  482. data/vendor/libgit2/src/win32/utf-conv.h +47 -6
  483. data/vendor/libgit2/src/win32/version.h +21 -4
  484. data/vendor/libgit2/src/win32/w32_buffer.c +54 -0
  485. data/vendor/libgit2/src/win32/w32_buffer.h +20 -0
  486. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +438 -0
  487. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +129 -0
  488. data/vendor/libgit2/src/win32/w32_stack.c +193 -0
  489. data/vendor/libgit2/src/win32/w32_stack.h +140 -0
  490. data/vendor/libgit2/src/win32/w32_util.c +95 -0
  491. data/vendor/libgit2/src/win32/w32_util.h +170 -0
  492. data/vendor/libgit2/src/win32/win32-compat.h +52 -0
  493. data/vendor/libgit2/src/worktree.c +578 -0
  494. data/vendor/libgit2/src/worktree.h +39 -0
  495. data/vendor/libgit2/src/xdiff/xdiff.h +33 -18
  496. data/vendor/libgit2/src/xdiff/xdiffi.c +578 -88
  497. data/vendor/libgit2/src/xdiff/xdiffi.h +3 -2
  498. data/vendor/libgit2/src/xdiff/xemit.c +106 -45
  499. data/vendor/libgit2/src/xdiff/xemit.h +3 -3
  500. data/vendor/libgit2/src/xdiff/xhistogram.c +5 -4
  501. data/vendor/libgit2/src/xdiff/xinclude.h +3 -2
  502. data/vendor/libgit2/src/xdiff/xmacros.h +2 -2
  503. data/vendor/libgit2/src/xdiff/xmerge.c +167 -48
  504. data/vendor/libgit2/src/xdiff/xpatience.c +42 -10
  505. data/vendor/libgit2/src/xdiff/xprepare.c +14 -14
  506. data/vendor/libgit2/src/xdiff/xprepare.h +2 -2
  507. data/vendor/libgit2/src/xdiff/xtypes.h +2 -2
  508. data/vendor/libgit2/src/xdiff/xutils.c +60 -56
  509. data/vendor/libgit2/src/xdiff/xutils.h +3 -5
  510. data/vendor/libgit2/src/zstream.c +205 -0
  511. data/vendor/libgit2/src/zstream.h +53 -0
  512. metadata +281 -233
  513. data/Rakefile +0 -61
  514. data/ext/rugged/rugged_diff_patch.c +0 -169
  515. data/lib/rugged/diff/patch.rb +0 -28
  516. data/test/blob_test.rb +0 -341
  517. data/test/branch_test.rb +0 -199
  518. data/test/commit_test.rb +0 -104
  519. data/test/config_test.rb +0 -45
  520. data/test/coverage/cover.rb +0 -133
  521. data/test/diff_test.rb +0 -777
  522. data/test/errors_test.rb +0 -34
  523. data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
  524. data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
  525. data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
  526. data/test/fixtures/archive.tar.gz +0 -0
  527. data/test/fixtures/attr/attr0 +0 -1
  528. data/test/fixtures/attr/attr1 +0 -29
  529. data/test/fixtures/attr/attr2 +0 -21
  530. data/test/fixtures/attr/attr3 +0 -4
  531. data/test/fixtures/attr/binfile +0 -1
  532. data/test/fixtures/attr/dir/file +0 -0
  533. data/test/fixtures/attr/file +0 -1
  534. data/test/fixtures/attr/gitattributes +0 -29
  535. data/test/fixtures/attr/gitignore +0 -2
  536. data/test/fixtures/attr/ign +0 -1
  537. data/test/fixtures/attr/macro_bad +0 -1
  538. data/test/fixtures/attr/macro_test +0 -1
  539. data/test/fixtures/attr/root_test1 +0 -1
  540. data/test/fixtures/attr/root_test2 +0 -6
  541. data/test/fixtures/attr/root_test3 +0 -19
  542. data/test/fixtures/attr/root_test4.txt +0 -14
  543. data/test/fixtures/attr/sub/abc +0 -37
  544. data/test/fixtures/attr/sub/dir/file +0 -0
  545. data/test/fixtures/attr/sub/file +0 -1
  546. data/test/fixtures/attr/sub/ign/file +0 -1
  547. data/test/fixtures/attr/sub/ign/sub/file +0 -1
  548. data/test/fixtures/attr/sub/sub/dir +0 -0
  549. data/test/fixtures/attr/sub/sub/file +0 -1
  550. data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
  551. data/test/fixtures/attr/sub/subdir_test1 +0 -2
  552. data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
  553. data/test/fixtures/diff/another.txt +0 -38
  554. data/test/fixtures/diff/readme.txt +0 -36
  555. data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
  556. data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
  557. data/test/fixtures/mergedrepo/one.txt +0 -10
  558. data/test/fixtures/mergedrepo/two.txt +0 -12
  559. data/test/fixtures/status/current_file +0 -1
  560. data/test/fixtures/status/ignored_file +0 -1
  561. data/test/fixtures/status/modified_file +0 -2
  562. data/test/fixtures/status/new_file +0 -1
  563. data/test/fixtures/status/staged_changes +0 -2
  564. data/test/fixtures/status/staged_changes_modified_file +0 -3
  565. data/test/fixtures/status/staged_delete_modified_file +0 -1
  566. data/test/fixtures/status/staged_new_file +0 -1
  567. data/test/fixtures/status/staged_new_file_modified_file +0 -2
  568. data/test/fixtures/status/subdir/current_file +0 -1
  569. data/test/fixtures/status/subdir/modified_file +0 -2
  570. data/test/fixtures/status/subdir/new_file +0 -1
  571. data/test/fixtures/status/subdir.txt +0 -2
  572. data/test/fixtures/status//350/277/231 +0 -1
  573. data/test/fixtures/testrepo.git/HEAD +0 -1
  574. data/test/fixtures/testrepo.git/config +0 -13
  575. data/test/fixtures/testrepo.git/description +0 -1
  576. data/test/fixtures/testrepo.git/index +0 -0
  577. data/test/fixtures/testrepo.git/info/exclude +0 -6
  578. data/test/fixtures/testrepo.git/logs/HEAD +0 -3
  579. data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
  580. data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
  581. data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
  582. data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
  583. data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
  584. data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
  585. data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
  586. data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
  587. data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
  588. data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
  589. data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
  590. data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
  591. data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
  592. data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
  593. data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
  594. data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
  595. data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
  596. data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
  597. data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
  598. data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
  599. data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
  600. data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
  601. data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
  602. data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
  603. data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
  604. data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
  605. data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
  606. data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
  607. data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
  608. data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  609. data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
  610. data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
  611. data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
  612. data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
  613. data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
  614. data/test/fixtures/testrepo.git/packed-refs +0 -2
  615. data/test/fixtures/testrepo.git/refs/heads/master +0 -1
  616. data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
  617. data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
  618. data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
  619. data/test/fixtures/text_file.md +0 -464
  620. data/test/fixtures/unsymlinked.git/HEAD +0 -1
  621. data/test/fixtures/unsymlinked.git/config +0 -6
  622. data/test/fixtures/unsymlinked.git/description +0 -1
  623. data/test/fixtures/unsymlinked.git/info/exclude +0 -2
  624. data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
  625. data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
  626. data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
  627. data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
  628. data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
  629. data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
  630. data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
  631. data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
  632. data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
  633. data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
  634. data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
  635. data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
  636. data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
  637. data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
  638. data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
  639. data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
  640. data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
  641. data/test/index_test.rb +0 -333
  642. data/test/lib_test.rb +0 -127
  643. data/test/note_test.rb +0 -158
  644. data/test/object_test.rb +0 -43
  645. data/test/reference_test.rb +0 -207
  646. data/test/remote_test.rb +0 -324
  647. data/test/repo_pack_test.rb +0 -24
  648. data/test/repo_reset_test.rb +0 -82
  649. data/test/repo_test.rb +0 -402
  650. data/test/tag_test.rb +0 -68
  651. data/test/test_helper.rb +0 -92
  652. data/test/tree_test.rb +0 -91
  653. data/test/walker_test.rb +0 -88
  654. data/vendor/libgit2/Makefile.embed +0 -42
  655. data/vendor/libgit2/include/git2/push.h +0 -131
  656. data/vendor/libgit2/include/git2/threads.h +0 -50
  657. data/vendor/libgit2/src/amiga/map.c +0 -48
  658. data/vendor/libgit2/src/bswap.h +0 -97
  659. data/vendor/libgit2/src/compress.c +0 -53
  660. data/vendor/libgit2/src/config_file.h +0 -60
  661. data/vendor/libgit2/src/delta-apply.c +0 -134
  662. data/vendor/libgit2/src/delta-apply.h +0 -50
  663. data/vendor/libgit2/src/diff_patch.c +0 -995
  664. data/vendor/libgit2/src/diff_patch.h +0 -46
  665. data/vendor/libgit2/src/hashsig.h +0 -72
  666. data/vendor/libgit2/src/merge_file.h +0 -71
  667. data/vendor/libgit2/src/win32/pthread.c +0 -144
  668. data/vendor/libgit2/src/win32/pthread.h +0 -50
@@ -4,169 +4,57 @@
4
4
  * This file is part of libgit2, distributed under the GNU GPL v2 with
5
5
  * a Linking Exception. For full terms see the included COPYING file.
6
6
  */
7
- #ifndef _WIN32
8
- # include <sys/types.h>
9
- # include <sys/socket.h>
10
- # include <sys/select.h>
11
- # include <sys/time.h>
12
- # include <netdb.h>
13
- # include <netinet/in.h>
14
- # include <arpa/inet.h>
15
- #else
16
- # include <ws2tcpip.h>
17
- # ifdef _MSC_VER
18
- # pragma comment(lib, "ws2_32")
19
- # endif
20
- #endif
21
-
22
- #ifdef __FreeBSD__
23
- # include <netinet/in.h>
24
- #endif
25
-
26
- #ifdef GIT_SSL
27
- # include <openssl/ssl.h>
28
- # include <openssl/err.h>
29
- # include <openssl/x509v3.h>
30
- #endif
7
+
8
+ #include "netops.h"
31
9
 
32
10
  #include <ctype.h>
33
11
  #include "git2/errors.h"
34
12
 
35
- #include "common.h"
36
- #include "netops.h"
37
13
  #include "posix.h"
38
14
  #include "buffer.h"
39
-
40
- #ifdef GIT_WIN32
41
- static void net_set_error(const char *str)
42
- {
43
- int error = WSAGetLastError();
44
- char * win32_error = git_win32_get_error_message(error);
45
-
46
- if (win32_error) {
47
- giterr_set(GITERR_NET, "%s: %s", str, win32_error);
48
- git__free(win32_error);
49
- } else {
50
- giterr_set(GITERR_NET, str);
51
- }
52
- }
53
- #else
54
- static void net_set_error(const char *str)
55
- {
56
- giterr_set(GITERR_NET, "%s: %s", str, strerror(errno));
57
- }
58
- #endif
59
-
60
- #ifdef GIT_SSL
61
- static int ssl_set_error(gitno_ssl *ssl, int error)
62
- {
63
- int err;
64
- unsigned long e;
65
-
66
- err = SSL_get_error(ssl->ssl, error);
67
-
68
- assert(err != SSL_ERROR_WANT_READ);
69
- assert(err != SSL_ERROR_WANT_WRITE);
70
-
71
- switch (err) {
72
- case SSL_ERROR_WANT_CONNECT:
73
- case SSL_ERROR_WANT_ACCEPT:
74
- giterr_set(GITERR_NET, "SSL error: connection failure\n");
75
- break;
76
- case SSL_ERROR_WANT_X509_LOOKUP:
77
- giterr_set(GITERR_NET, "SSL error: x509 error\n");
78
- break;
79
- case SSL_ERROR_SYSCALL:
80
- e = ERR_get_error();
81
- if (e > 0) {
82
- giterr_set(GITERR_NET, "SSL error: %s",
83
- ERR_error_string(e, NULL));
84
- break;
85
- } else if (error < 0) {
86
- giterr_set(GITERR_OS, "SSL error: syscall failure");
87
- break;
88
- }
89
- giterr_set(GITERR_NET, "SSL error: received early EOF");
90
- break;
91
- case SSL_ERROR_SSL:
92
- e = ERR_get_error();
93
- giterr_set(GITERR_NET, "SSL error: %s",
94
- ERR_error_string(e, NULL));
95
- break;
96
- case SSL_ERROR_NONE:
97
- case SSL_ERROR_ZERO_RETURN:
98
- default:
99
- giterr_set(GITERR_NET, "SSL error: unknown error");
100
- break;
101
- }
102
- return -1;
103
- }
104
- #endif
15
+ #include "http_parser.h"
16
+ #include "global.h"
105
17
 
106
18
  int gitno_recv(gitno_buffer *buf)
107
19
  {
108
20
  return buf->recv(buf);
109
21
  }
110
22
 
111
- #ifdef GIT_SSL
112
- static int gitno__recv_ssl(gitno_buffer *buf)
23
+ void gitno_buffer_setup_callback(
24
+ gitno_buffer *buf,
25
+ char *data,
26
+ size_t len,
27
+ int (*recv)(gitno_buffer *buf), void *cb_data)
113
28
  {
114
- int ret;
115
-
116
- do {
117
- ret = SSL_read(buf->socket->ssl.ssl, buf->data + buf->offset, buf->len - buf->offset);
118
- } while (SSL_get_error(buf->socket->ssl.ssl, ret) == SSL_ERROR_WANT_READ);
119
-
120
- if (ret < 0) {
121
- net_set_error("Error receiving socket data");
122
- return -1;
123
- }
124
-
125
- buf->offset += ret;
126
- return ret;
29
+ memset(data, 0x0, len);
30
+ buf->data = data;
31
+ buf->len = len;
32
+ buf->offset = 0;
33
+ buf->recv = recv;
34
+ buf->cb_data = cb_data;
127
35
  }
128
- #endif
129
36
 
130
- static int gitno__recv(gitno_buffer *buf)
37
+ static int recv_stream(gitno_buffer *buf)
131
38
  {
39
+ git_stream *io = (git_stream *) buf->cb_data;
132
40
  int ret;
133
41
 
134
- ret = p_recv(buf->socket->socket, buf->data + buf->offset, buf->len - buf->offset, 0);
135
- if (ret < 0) {
136
- net_set_error("Error receiving socket data");
42
+ ret = git_stream_read(io, buf->data + buf->offset, buf->len - buf->offset);
43
+ if (ret < 0)
137
44
  return -1;
138
- }
139
45
 
140
46
  buf->offset += ret;
141
47
  return ret;
142
48
  }
143
49
 
144
- void gitno_buffer_setup_callback(
145
- gitno_socket *socket,
146
- gitno_buffer *buf,
147
- char *data,
148
- size_t len,
149
- int (*recv)(gitno_buffer *buf), void *cb_data)
50
+ void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len)
150
51
  {
151
52
  memset(data, 0x0, len);
152
53
  buf->data = data;
153
54
  buf->len = len;
154
55
  buf->offset = 0;
155
- buf->socket = socket;
156
- buf->recv = recv;
157
- buf->cb_data = cb_data;
158
- }
159
-
160
- void gitno_buffer_setup(gitno_socket *socket, gitno_buffer *buf, char *data, size_t len)
161
- {
162
- #ifdef GIT_SSL
163
- if (socket->ssl.ctx) {
164
- gitno_buffer_setup_callback(socket, buf, data, len, gitno__recv_ssl, NULL);
165
- return;
166
- }
167
- #endif
168
-
169
- gitno_buffer_setup_callback(socket, buf, data, len, gitno__recv, NULL);
56
+ buf->recv = recv_stream;
57
+ buf->cb_data = st;
170
58
  }
171
59
 
172
60
  /* Consume up to ptr and move the rest of the buffer to the beginning */
@@ -192,28 +80,11 @@ void gitno_consume_n(gitno_buffer *buf, size_t cons)
192
80
  buf->offset -= cons;
193
81
  }
194
82
 
195
- #ifdef GIT_SSL
196
-
197
- static int gitno_ssl_teardown(gitno_ssl *ssl)
198
- {
199
- int ret;
200
-
201
- ret = SSL_shutdown(ssl->ssl);
202
- if (ret < 0)
203
- ret = ssl_set_error(ssl, ret);
204
- else
205
- ret = 0;
206
-
207
- SSL_free(ssl->ssl);
208
- SSL_CTX_free(ssl->ctx);
209
- return ret;
210
- }
211
-
212
83
  /* Match host names according to RFC 2818 rules */
213
- static int match_host(const char *pattern, const char *host)
84
+ int gitno__match_host(const char *pattern, const char *host)
214
85
  {
215
86
  for (;;) {
216
- char c = tolower(*pattern++);
87
+ char c = git__tolower(*pattern++);
217
88
 
218
89
  if (c == '\0')
219
90
  return *host ? -1 : 0;
@@ -231,401 +102,209 @@ static int match_host(const char *pattern, const char *host)
231
102
  */
232
103
 
233
104
  while(*host) {
234
- char h = tolower(*host);
105
+ char h = git__tolower(*host);
235
106
  if (c == h)
236
- return match_host(pattern, host++);
107
+ return gitno__match_host(pattern, host++);
237
108
  if (h == '.')
238
- return match_host(pattern, host);
109
+ return gitno__match_host(pattern, host);
239
110
  host++;
240
111
  }
241
112
  return -1;
242
113
  }
243
114
 
244
- if (c != tolower(*host++))
115
+ if (c != git__tolower(*host++))
245
116
  return -1;
246
117
  }
247
118
 
248
119
  return -1;
249
120
  }
250
121
 
251
- static int check_host_name(const char *name, const char *host)
252
- {
253
- if (!strcasecmp(name, host))
254
- return 0;
255
-
256
- if (match_host(name, host) < 0)
257
- return -1;
258
-
259
- return 0;
260
- }
261
-
262
- static int verify_server_cert(gitno_ssl *ssl, const char *host)
263
- {
264
- X509 *cert;
265
- X509_NAME *peer_name;
266
- ASN1_STRING *str;
267
- unsigned char *peer_cn = NULL;
268
- int matched = -1, type = GEN_DNS;
269
- GENERAL_NAMES *alts;
270
- struct in6_addr addr6;
271
- struct in_addr addr4;
272
- void *addr;
273
- int i = -1,j;
274
-
275
- if (SSL_get_verify_result(ssl->ssl) != X509_V_OK) {
276
- giterr_set(GITERR_SSL, "The SSL certificate is invalid");
277
- return -1;
278
- }
279
-
280
- /* Try to parse the host as an IP address to see if it is */
281
- if (p_inet_pton(AF_INET, host, &addr4)) {
282
- type = GEN_IPADD;
283
- addr = &addr4;
284
- } else {
285
- if(p_inet_pton(AF_INET6, host, &addr6)) {
286
- type = GEN_IPADD;
287
- addr = &addr6;
288
- }
289
- }
290
-
291
-
292
- cert = SSL_get_peer_certificate(ssl->ssl);
293
-
294
- /* Check the alternative names */
295
- alts = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
296
- if (alts) {
297
- int num;
298
-
299
- num = sk_GENERAL_NAME_num(alts);
300
- for (i = 0; i < num && matched != 1; i++) {
301
- const GENERAL_NAME *gn = sk_GENERAL_NAME_value(alts, i);
302
- const char *name = (char *) ASN1_STRING_data(gn->d.ia5);
303
- size_t namelen = (size_t) ASN1_STRING_length(gn->d.ia5);
304
-
305
- /* Skip any names of a type we're not looking for */
306
- if (gn->type != type)
307
- continue;
308
-
309
- if (type == GEN_DNS) {
310
- /* If it contains embedded NULs, don't even try */
311
- if (memchr(name, '\0', namelen))
312
- continue;
313
-
314
- if (check_host_name(name, host) < 0)
315
- matched = 0;
316
- else
317
- matched = 1;
318
- } else if (type == GEN_IPADD) {
319
- /* Here name isn't so much a name but a binary representation of the IP */
320
- matched = !!memcmp(name, addr, namelen);
321
- }
322
- }
323
- }
324
- GENERAL_NAMES_free(alts);
325
-
326
- if (matched == 0)
327
- goto cert_fail;
328
-
329
- if (matched == 1)
330
- return 0;
122
+ static const char *default_port_http = "80";
123
+ static const char *default_port_https = "443";
331
124
 
332
- /* If no alternative names are available, check the common name */
333
- peer_name = X509_get_subject_name(cert);
334
- if (peer_name == NULL)
335
- goto on_error;
336
-
337
- if (peer_name) {
338
- /* Get the index of the last CN entry */
339
- while ((j = X509_NAME_get_index_by_NID(peer_name, NID_commonName, i)) >= 0)
340
- i = j;
341
- }
342
-
343
- if (i < 0)
344
- goto on_error;
345
-
346
- str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(peer_name, i));
347
- if (str == NULL)
348
- goto on_error;
349
-
350
- /* Work around a bug in OpenSSL whereby ASN1_STRING_to_UTF8 fails if it's already in utf-8 */
351
- if (ASN1_STRING_type(str) == V_ASN1_UTF8STRING) {
352
- int size = ASN1_STRING_length(str);
353
-
354
- if (size > 0) {
355
- peer_cn = OPENSSL_malloc(size + 1);
356
- GITERR_CHECK_ALLOC(peer_cn);
357
- memcpy(peer_cn, ASN1_STRING_data(str), size);
358
- peer_cn[size] = '\0';
359
- }
360
- } else {
361
- int size = ASN1_STRING_to_UTF8(&peer_cn, str);
362
- GITERR_CHECK_ALLOC(peer_cn);
363
- if (memchr(peer_cn, '\0', size))
364
- goto cert_fail;
365
- }
366
-
367
- if (check_host_name((char *)peer_cn, host) < 0)
368
- goto cert_fail;
369
-
370
- OPENSSL_free(peer_cn);
371
-
372
- return 0;
373
-
374
- on_error:
375
- OPENSSL_free(peer_cn);
376
- return ssl_set_error(ssl, 0);
377
-
378
- cert_fail:
379
- OPENSSL_free(peer_cn);
380
- giterr_set(GITERR_SSL, "Certificate host name check failed");
381
- return -1;
382
- }
383
-
384
- static int ssl_setup(gitno_socket *socket, const char *host, int flags)
125
+ const char *gitno__default_port(
126
+ gitno_connection_data *data)
385
127
  {
386
- int ret;
387
-
388
- SSL_library_init();
389
- SSL_load_error_strings();
390
- socket->ssl.ctx = SSL_CTX_new(SSLv23_method());
391
- if (socket->ssl.ctx == NULL)
392
- return ssl_set_error(&socket->ssl, 0);
393
-
394
- SSL_CTX_set_mode(socket->ssl.ctx, SSL_MODE_AUTO_RETRY);
395
- SSL_CTX_set_verify(socket->ssl.ctx, SSL_VERIFY_NONE, NULL);
396
- if (!SSL_CTX_set_default_verify_paths(socket->ssl.ctx))
397
- return ssl_set_error(&socket->ssl, 0);
398
-
399
- socket->ssl.ssl = SSL_new(socket->ssl.ctx);
400
- if (socket->ssl.ssl == NULL)
401
- return ssl_set_error(&socket->ssl, 0);
402
-
403
- if((ret = SSL_set_fd(socket->ssl.ssl, socket->socket)) == 0)
404
- return ssl_set_error(&socket->ssl, ret);
405
-
406
- if ((ret = SSL_connect(socket->ssl.ssl)) <= 0)
407
- return ssl_set_error(&socket->ssl, ret);
408
-
409
- if (GITNO_CONNECT_SSL_NO_CHECK_CERT & flags)
410
- return 0;
411
-
412
- return verify_server_cert(&socket->ssl, host);
128
+ return data->use_ssl ? default_port_https : default_port_http;
413
129
  }
414
- #endif
415
130
 
416
- static int gitno__close(GIT_SOCKET s)
417
- {
418
- #ifdef GIT_WIN32
419
- if (SOCKET_ERROR == closesocket(s))
420
- return -1;
421
-
422
- if (0 != WSACleanup()) {
423
- giterr_set(GITERR_OS, "Winsock cleanup failed");
424
- return -1;
425
- }
426
-
427
- return 0;
428
- #else
429
- return close(s);
430
- #endif
431
- }
131
+ static const char *prefix_http = "http://";
132
+ static const char *prefix_https = "https://";
432
133
 
433
- int gitno_connect(gitno_socket *s_out, const char *host, const char *port, int flags)
134
+ int gitno_connection_data_from_url(
135
+ gitno_connection_data *data,
136
+ const char *url,
137
+ const char *service_suffix)
434
138
  {
435
- struct addrinfo *info = NULL, *p;
436
- struct addrinfo hints;
437
- GIT_SOCKET s = INVALID_SOCKET;
438
- int ret;
439
-
440
- #ifdef GIT_WIN32
441
- /* on win32, the WSA context needs to be initialized
442
- * before any socket calls can be performed */
443
- WSADATA wsd;
444
-
445
- if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) {
446
- giterr_set(GITERR_OS, "Winsock init failed");
447
- return -1;
448
- }
449
-
450
- if (LOBYTE(wsd.wVersion) != 2 || HIBYTE(wsd.wVersion) != 2) {
451
- WSACleanup();
452
- giterr_set(GITERR_OS, "Winsock init failed");
453
- return -1;
454
- }
455
- #endif
456
-
457
- /* Zero the socket structure provided */
458
- memset(s_out, 0x0, sizeof(gitno_socket));
139
+ int error = -1;
140
+ const char *default_port = NULL, *path_search_start = NULL;
141
+ char *original_host = NULL;
459
142
 
460
- memset(&hints, 0x0, sizeof(struct addrinfo));
461
- hints.ai_socktype = SOCK_STREAM;
462
- hints.ai_family = AF_UNSPEC;
143
+ /* service_suffix is optional */
144
+ assert(data && url);
463
145
 
464
- if ((ret = p_getaddrinfo(host, port, &hints, &info)) < 0) {
465
- giterr_set(GITERR_NET,
466
- "Failed to resolve address for %s: %s", host, p_gai_strerror(ret));
467
- return -1;
468
- }
146
+ /* Save these for comparison later */
147
+ original_host = data->host;
148
+ data->host = NULL;
149
+ gitno_connection_data_free_ptrs(data);
469
150
 
470
- for (p = info; p != NULL; p = p->ai_next) {
471
- s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
151
+ if (!git__prefixcmp(url, prefix_http)) {
152
+ path_search_start = url + strlen(prefix_http);
153
+ default_port = default_port_http;
472
154
 
473
- if (s == INVALID_SOCKET) {
474
- net_set_error("error creating socket");
475
- break;
155
+ if (data->use_ssl) {
156
+ git_error_set(GIT_ERROR_NET, "redirect from HTTPS to HTTP is not allowed");
157
+ goto cleanup;
476
158
  }
477
-
478
- if (connect(s, p->ai_addr, (socklen_t)p->ai_addrlen) == 0)
479
- break;
480
-
481
- /* If we can't connect, try the next one */
482
- gitno__close(s);
483
- s = INVALID_SOCKET;
159
+ } else if (!git__prefixcmp(url, prefix_https)) {
160
+ path_search_start = url + strlen(prefix_https);
161
+ default_port = default_port_https;
162
+ data->use_ssl = true;
163
+ } else if (url[0] == '/')
164
+ default_port = gitno__default_port(data);
165
+
166
+ if (!default_port) {
167
+ git_error_set(GIT_ERROR_NET, "unrecognized URL prefix");
168
+ goto cleanup;
484
169
  }
485
170
 
486
- /* Oops, we couldn't connect to any address */
487
- if (s == INVALID_SOCKET && p == NULL) {
488
- giterr_set(GITERR_OS, "Failed to connect to %s", host);
489
- p_freeaddrinfo(info);
490
- return -1;
491
- }
171
+ error = gitno_extract_url_parts(
172
+ &data->host, &data->port, &data->path, &data->user, &data->pass,
173
+ url, default_port);
492
174
 
493
- s_out->socket = s;
494
- p_freeaddrinfo(info);
495
-
496
- #ifdef GIT_SSL
497
- if ((flags & GITNO_CONNECT_SSL) && ssl_setup(s_out, host, flags) < 0)
498
- return -1;
499
- #else
500
- /* SSL is not supported */
501
- if (flags & GITNO_CONNECT_SSL) {
502
- giterr_set(GITERR_OS, "SSL is not supported by this copy of libgit2.");
503
- return -1;
175
+ if (url[0] == '/') {
176
+ /* Relative redirect; reuse original host name and port */
177
+ path_search_start = url;
178
+ git__free(data->host);
179
+ data->host = original_host;
180
+ original_host = NULL;
504
181
  }
505
- #endif
506
-
507
- return 0;
508
- }
509
182
 
510
- #ifdef GIT_SSL
511
- static int gitno_send_ssl(gitno_ssl *ssl, const char *msg, size_t len, int flags)
512
- {
513
- int ret;
514
- size_t off = 0;
515
-
516
- GIT_UNUSED(flags);
517
-
518
- while (off < len) {
519
- ret = SSL_write(ssl->ssl, msg + off, len - off);
520
- if (ret <= 0 && ret != SSL_ERROR_WANT_WRITE)
521
- return ssl_set_error(ssl, ret);
522
-
523
- off += ret;
524
- }
525
-
526
- return off;
527
- }
528
- #endif
529
-
530
- int gitno_send(gitno_socket *socket, const char *msg, size_t len, int flags)
531
- {
532
- int ret;
533
- size_t off = 0;
534
-
535
- #ifdef GIT_SSL
536
- if (socket->ssl.ctx)
537
- return gitno_send_ssl(&socket->ssl, msg, len, flags);
538
- #endif
539
-
540
- while (off < len) {
541
- errno = 0;
542
- ret = p_send(socket->socket, msg + off, len - off, flags);
543
- if (ret < 0) {
544
- net_set_error("Error sending data");
545
- return -1;
183
+ if (!error) {
184
+ const char *path = strchr(path_search_start, '/');
185
+ size_t pathlen = strlen(path);
186
+ size_t suffixlen = service_suffix ? strlen(service_suffix) : 0;
187
+
188
+ if (suffixlen &&
189
+ !memcmp(path + pathlen - suffixlen, service_suffix, suffixlen)) {
190
+ git__free(data->path);
191
+ data->path = git__strndup(path, pathlen - suffixlen);
192
+ } else {
193
+ git__free(data->path);
194
+ data->path = git__strdup(path);
546
195
  }
547
196
 
548
- off += ret;
197
+ /* Check for errors in the resulting data */
198
+ if (original_host && url[0] != '/' && strcmp(original_host, data->host)) {
199
+ git_error_set(GIT_ERROR_NET, "cross host redirect not allowed");
200
+ error = -1;
201
+ }
549
202
  }
550
203
 
551
- return (int)off;
204
+ cleanup:
205
+ if (original_host) git__free(original_host);
206
+ return error;
552
207
  }
553
208
 
554
- int gitno_close(gitno_socket *s)
209
+ void gitno_connection_data_free_ptrs(gitno_connection_data *d)
555
210
  {
556
- #ifdef GIT_SSL
557
- if (s->ssl.ctx &&
558
- gitno_ssl_teardown(&s->ssl) < 0)
559
- return -1;
560
- #endif
561
-
562
- return gitno__close(s->socket);
563
- }
564
-
565
- int gitno_select_in(gitno_buffer *buf, long int sec, long int usec)
566
- {
567
- fd_set fds;
568
- struct timeval tv;
569
-
570
- tv.tv_sec = sec;
571
- tv.tv_usec = usec;
572
-
573
- FD_ZERO(&fds);
574
- FD_SET(buf->socket->socket, &fds);
575
-
576
- /* The select(2) interface is silly */
577
- return select((int)buf->socket->socket + 1, &fds, NULL, NULL, &tv);
211
+ git__free(d->host); d->host = NULL;
212
+ git__free(d->port); d->port = NULL;
213
+ git__free(d->path); d->path = NULL;
214
+ git__free(d->user); d->user = NULL;
215
+ git__free(d->pass); d->pass = NULL;
578
216
  }
579
217
 
580
218
  int gitno_extract_url_parts(
581
- char **host,
582
- char **port,
583
- char **username,
584
- char **password,
585
- const char *url,
586
- const char *default_port)
219
+ char **host_out,
220
+ char **port_out,
221
+ char **path_out,
222
+ char **username_out,
223
+ char **password_out,
224
+ const char *url,
225
+ const char *default_port)
587
226
  {
588
- char *colon, *slash, *at, *end;
589
- const char *start;
590
-
591
- /*
592
- *
593
- * ==> [user[:pass]@]hostname.tld[:port]/resource
594
- */
227
+ struct http_parser_url u = {0};
228
+ bool has_host, has_port, has_path, has_userinfo;
229
+ git_buf host = GIT_BUF_INIT,
230
+ port = GIT_BUF_INIT,
231
+ path = GIT_BUF_INIT,
232
+ username = GIT_BUF_INIT,
233
+ password = GIT_BUF_INIT;
234
+ int error = 0;
235
+
236
+ if (http_parser_parse_url(url, strlen(url), false, &u)) {
237
+ git_error_set(GIT_ERROR_NET, "malformed URL '%s'", url);
238
+ error = GIT_EINVALIDSPEC;
239
+ goto done;
240
+ }
595
241
 
596
- colon = strchr(url, ':');
597
- slash = strchr(url, '/');
598
- at = strchr(url, '@');
242
+ has_host = !!(u.field_set & (1 << UF_HOST));
243
+ has_port = !!(u.field_set & (1 << UF_PORT));
244
+ has_path = !!(u.field_set & (1 << UF_PATH));
245
+ has_userinfo = !!(u.field_set & (1 << UF_USERINFO));
599
246
 
600
- if (slash == NULL) {
601
- giterr_set(GITERR_NET, "Malformed URL: missing /");
602
- return -1;
247
+ if (has_host) {
248
+ const char *url_host = url + u.field_data[UF_HOST].off;
249
+ size_t url_host_len = u.field_data[UF_HOST].len;
250
+ git_buf_decode_percent(&host, url_host, url_host_len);
603
251
  }
604
252
 
605
- start = url;
606
- if (at && at < slash) {
607
- start = at+1;
608
- *username = git__substrdup(url, at - url);
253
+ if (has_port) {
254
+ const char *url_port = url + u.field_data[UF_PORT].off;
255
+ size_t url_port_len = u.field_data[UF_PORT].len;
256
+ git_buf_put(&port, url_port, url_port_len);
257
+ } else {
258
+ git_buf_puts(&port, default_port);
609
259
  }
610
260
 
611
- if (colon && colon < at) {
612
- git__free(*username);
613
- *username = git__substrdup(url, colon-url);
614
- *password = git__substrdup(colon+1, at-colon-1);
615
- colon = strchr(at, ':');
261
+ if (has_path && path_out) {
262
+ const char *url_path = url + u.field_data[UF_PATH].off;
263
+ size_t url_path_len = u.field_data[UF_PATH].len;
264
+ git_buf_decode_percent(&path, url_path, url_path_len);
265
+ } else if (path_out) {
266
+ git_error_set(GIT_ERROR_NET, "invalid url, missing path");
267
+ error = GIT_EINVALIDSPEC;
268
+ goto done;
616
269
  }
617
270
 
618
- if (colon == NULL) {
619
- *port = git__strdup(default_port);
620
- } else {
621
- *port = git__substrdup(colon + 1, slash - colon - 1);
271
+ if (has_userinfo) {
272
+ const char *url_userinfo = url + u.field_data[UF_USERINFO].off;
273
+ size_t url_userinfo_len = u.field_data[UF_USERINFO].len;
274
+ const char *colon = memchr(url_userinfo, ':', url_userinfo_len);
275
+
276
+ if (colon) {
277
+ const char *url_username = url_userinfo;
278
+ size_t url_username_len = colon - url_userinfo;
279
+ const char *url_password = colon + 1;
280
+ size_t url_password_len = url_userinfo_len - (url_username_len + 1);
281
+
282
+ git_buf_decode_percent(&username, url_username, url_username_len);
283
+ git_buf_decode_percent(&password, url_password, url_password_len);
284
+ } else {
285
+ git_buf_decode_percent(&username, url_userinfo, url_userinfo_len);
286
+ }
622
287
  }
623
- GITERR_CHECK_ALLOC(*port);
624
288
 
625
- end = colon == NULL ? slash : colon;
626
-
627
- *host = git__substrdup(start, end - start);
628
- GITERR_CHECK_ALLOC(*host);
289
+ if (git_buf_oom(&host) ||
290
+ git_buf_oom(&port) ||
291
+ git_buf_oom(&path) ||
292
+ git_buf_oom(&username) ||
293
+ git_buf_oom(&password))
294
+ return -1;
629
295
 
630
- return 0;
296
+ *host_out = git_buf_detach(&host);
297
+ *port_out = git_buf_detach(&port);
298
+ if (path_out)
299
+ *path_out = git_buf_detach(&path);
300
+ *username_out = git_buf_detach(&username);
301
+ *password_out = git_buf_detach(&password);
302
+
303
+ done:
304
+ git_buf_dispose(&host);
305
+ git_buf_dispose(&port);
306
+ git_buf_dispose(&path);
307
+ git_buf_dispose(&username);
308
+ git_buf_dispose(&password);
309
+ return error;
631
310
  }