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
@@ -0,0 +1,357 @@
1
+ /*
2
+ * Copyright (C) the libgit2 contributors. All rights reserved.
3
+ *
4
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
5
+ * a Linking Exception. For full terms see the included COPYING file.
6
+ */
7
+ #ifndef INCLUDE_str_h__
8
+ #define INCLUDE_str_h__
9
+
10
+ #include "git2_util.h"
11
+
12
+ struct git_str {
13
+ char *ptr;
14
+ size_t asize;
15
+ size_t size;
16
+ };
17
+
18
+ typedef enum {
19
+ GIT_STR_BOM_NONE = 0,
20
+ GIT_STR_BOM_UTF8 = 1,
21
+ GIT_STR_BOM_UTF16_LE = 2,
22
+ GIT_STR_BOM_UTF16_BE = 3,
23
+ GIT_STR_BOM_UTF32_LE = 4,
24
+ GIT_STR_BOM_UTF32_BE = 5
25
+ } git_str_bom_t;
26
+
27
+ typedef struct {
28
+ git_str_bom_t bom; /* BOM found at head of text */
29
+ unsigned int nul, cr, lf, crlf; /* NUL, CR, LF and CRLF counts */
30
+ unsigned int printable, nonprintable; /* These are just approximations! */
31
+ } git_str_text_stats;
32
+
33
+ extern char git_str__initstr[];
34
+ extern char git_str__oom[];
35
+
36
+ /* Use to initialize string buffer structure when git_str is on stack */
37
+ #define GIT_STR_INIT { git_str__initstr, 0, 0 }
38
+
39
+ /**
40
+ * Static initializer for git_str from static string buffer
41
+ */
42
+ #define GIT_STR_INIT_CONST(str, len) { (char *)(str), 0, (size_t)(len) }
43
+
44
+ GIT_INLINE(bool) git_str_is_allocated(const git_str *str)
45
+ {
46
+ return (str->ptr != NULL && str->asize > 0);
47
+ }
48
+
49
+ /**
50
+ * Initialize a git_str structure.
51
+ *
52
+ * For the cases where GIT_STR_INIT cannot be used to do static
53
+ * initialization.
54
+ */
55
+ extern int git_str_init(git_str *str, size_t initial_size);
56
+
57
+ extern void git_str_dispose(git_str *str);
58
+
59
+ /**
60
+ * Resize the string buffer allocation to make more space.
61
+ *
62
+ * This will attempt to grow the string buffer to accommodate the target
63
+ * size. The bstring buffer's `ptr` will be replaced with a newly
64
+ * allocated block of data. Be careful so that memory allocated by the
65
+ * caller is not lost. As a special variant, if you pass `target_size` as
66
+ * 0 and the memory is not allocated by libgit2, this will allocate a new
67
+ * buffer of size `size` and copy the external data into it.
68
+ *
69
+ * Currently, this will never shrink a buffer, only expand it.
70
+ *
71
+ * If the allocation fails, this will return an error and the buffer will be
72
+ * marked as invalid for future operations, invaliding the contents.
73
+ *
74
+ * @param str The buffer to be resized; may or may not be allocated yet
75
+ * @param target_size The desired available size
76
+ * @return 0 on success, -1 on allocation failure
77
+ */
78
+ int git_str_grow(git_str *str, size_t target_size);
79
+
80
+ /**
81
+ * Resize the buffer allocation to make more space.
82
+ *
83
+ * This will attempt to grow the string buffer to accommodate the
84
+ * additional size. It is similar to `git_str_grow`, but performs the
85
+ * new size calculation, checking for overflow.
86
+ *
87
+ * Like `git_str_grow`, if this is a user-supplied string buffer,
88
+ * this will allocate a new string uffer.
89
+ */
90
+ extern int git_str_grow_by(git_str *str, size_t additional_size);
91
+
92
+ /**
93
+ * Attempt to grow the buffer to hold at least `target_size` bytes.
94
+ *
95
+ * If the allocation fails, this will return an error. If `mark_oom` is
96
+ * true, this will mark the string buffer as invalid for future
97
+ * operations; if false, existing string buffer content will be preserved,
98
+ * but calling code must handle that string buffer was not expanded. If
99
+ * `preserve_external` is true, then any existing data pointed to be
100
+ * `ptr` even if `asize` is zero will be copied into the newly allocated
101
+ * string buffer.
102
+ */
103
+ extern int git_str_try_grow(
104
+ git_str *str, size_t target_size, bool mark_oom);
105
+
106
+ extern void git_str_swap(git_str *str_a, git_str *str_b);
107
+ extern char *git_str_detach(git_str *str);
108
+ extern int git_str_attach(git_str *str, char *ptr, size_t asize);
109
+
110
+ /* Populates a `git_str` where the contents are not "owned" by the string
111
+ * buffer, and calls to `git_str_dispose` will not free the given str.
112
+ */
113
+ extern void git_str_attach_notowned(
114
+ git_str *str, const char *ptr, size_t size);
115
+
116
+ /**
117
+ * Test if there have been any reallocation failures with this git_str.
118
+ *
119
+ * Any function that writes to a git_str can fail due to memory allocation
120
+ * issues. If one fails, the git_str will be marked with an OOM error and
121
+ * further calls to modify the string buffer will fail. Check
122
+ * git_str_oom() at the end of your sequence and it will be true if you
123
+ * ran out of memory at any point with that string buffer.
124
+ *
125
+ * @return false if no error, true if allocation error
126
+ */
127
+ GIT_INLINE(bool) git_str_oom(const git_str *str)
128
+ {
129
+ return (str->ptr == git_str__oom);
130
+ }
131
+
132
+ /*
133
+ * Functions below that return int value error codes will return 0 on
134
+ * success or -1 on failure (which generally means an allocation failed).
135
+ * Using a git_str where the allocation has failed with result in -1 from
136
+ * all further calls using that string buffer. As a result, you can
137
+ * ignore the return code of these functions and call them in a series
138
+ * then just call git_str_oom at the end.
139
+ */
140
+
141
+ int git_str_set(git_str *str, const void *data, size_t datalen);
142
+
143
+ int git_str_sets(git_str *str, const char *string);
144
+ int git_str_putc(git_str *str, char c);
145
+ int git_str_putcn(git_str *str, char c, size_t len);
146
+ int git_str_put(git_str *str, const char *data, size_t len);
147
+ int git_str_puts(git_str *str, const char *string);
148
+ int git_str_printf(git_str *str, const char *format, ...) GIT_FORMAT_PRINTF(2, 3);
149
+ int git_str_vprintf(git_str *str, const char *format, va_list ap);
150
+ void git_str_clear(git_str *str);
151
+ void git_str_consume_bytes(git_str *str, size_t len);
152
+ void git_str_consume(git_str *str, const char *end);
153
+ void git_str_truncate(git_str *str, size_t len);
154
+ void git_str_shorten(git_str *str, size_t amount);
155
+ void git_str_truncate_at_char(git_str *path, char separator);
156
+ void git_str_rtruncate_at_char(git_str *path, char separator);
157
+
158
+ /** General join with separator */
159
+ int git_str_join_n(git_str *str, char separator, int len, ...);
160
+ /** Fast join of two strings - first may legally point into `str` data */
161
+ int git_str_join(git_str *str, char separator, const char *str_a, const char *str_b);
162
+ /** Fast join of three strings - cannot reference `str` data */
163
+ int git_str_join3(git_str *str, char separator, const char *str_a, const char *str_b, const char *str_c);
164
+
165
+ /**
166
+ * Join two strings as paths, inserting a slash between as needed.
167
+ * @return 0 on success, -1 on failure
168
+ */
169
+ GIT_INLINE(int) git_str_joinpath(git_str *str, const char *a, const char *b)
170
+ {
171
+ return git_str_join(str, '/', a, b);
172
+ }
173
+
174
+ GIT_INLINE(const char *) git_str_cstr(const git_str *str)
175
+ {
176
+ return str->ptr;
177
+ }
178
+
179
+ GIT_INLINE(size_t) git_str_len(const git_str *str)
180
+ {
181
+ return str->size;
182
+ }
183
+
184
+ int git_str_copy_cstr(char *data, size_t datasize, const git_str *str);
185
+
186
+ #define git_str_PUTS(str, cstr) git_str_put(str, cstr, sizeof(cstr) - 1)
187
+
188
+ GIT_INLINE(ssize_t) git_str_rfind_next(const git_str *str, char ch)
189
+ {
190
+ ssize_t idx = (ssize_t)str->size - 1;
191
+ while (idx >= 0 && str->ptr[idx] == ch) idx--;
192
+ while (idx >= 0 && str->ptr[idx] != ch) idx--;
193
+ return idx;
194
+ }
195
+
196
+ GIT_INLINE(ssize_t) git_str_rfind(const git_str *str, char ch)
197
+ {
198
+ ssize_t idx = (ssize_t)str->size - 1;
199
+ while (idx >= 0 && str->ptr[idx] != ch) idx--;
200
+ return idx;
201
+ }
202
+
203
+ GIT_INLINE(ssize_t) git_str_find(const git_str *str, char ch)
204
+ {
205
+ void *found = memchr(str->ptr, ch, str->size);
206
+ return found ? (ssize_t)((const char *)found - str->ptr) : -1;
207
+ }
208
+
209
+ /* Remove whitespace from the end of the string buffer */
210
+ void git_str_rtrim(git_str *str);
211
+
212
+ int git_str_cmp(const git_str *a, const git_str *b);
213
+
214
+ /* Quote and unquote a string buffer as specified in
215
+ * http://marc.info/?l=git&m=112927316408690&w=2
216
+ */
217
+ int git_str_quote(git_str *str);
218
+ int git_str_unquote(git_str *str);
219
+
220
+ /* Write data as a hex string */
221
+ int git_str_encode_hexstr(git_str *str, const char *data, size_t len);
222
+
223
+ /* Write data as base64 encoded in string buffer */
224
+ int git_str_encode_base64(git_str *str, const char *data, size_t len);
225
+ /* Decode the given bas64 and write the result to the string buffer */
226
+ int git_str_decode_base64(git_str *str, const char *base64, size_t len);
227
+
228
+ /* Write data as "base85" encoded in string buffer */
229
+ int git_str_encode_base85(git_str *str, const char *data, size_t len);
230
+ /* Decode the given "base85" and write the result to the string buffer */
231
+ int git_str_decode_base85(git_str *str, const char *base64, size_t len, size_t output_len);
232
+
233
+ /*
234
+ * Decode the given percent-encoded string and write the result to the
235
+ * string buffer.
236
+ */
237
+ int git_str_decode_percent(git_str *str, const char *encoded, size_t len);
238
+
239
+ /*
240
+ * Insert, remove or replace a portion of the string buffer.
241
+ *
242
+ * @param str The string buffer to work with
243
+ *
244
+ * @param where The location in the string buffer where the transformation
245
+ * should be applied.
246
+ *
247
+ * @param nb_to_remove The number of chars to be removed. 0 to not
248
+ * remove any character in the string buffer.
249
+ *
250
+ * @param data A pointer to the data which should be inserted.
251
+ *
252
+ * @param nb_to_insert The number of chars to be inserted. 0 to not
253
+ * insert any character from the string buffer.
254
+ *
255
+ * @return 0 or an error code.
256
+ */
257
+ int git_str_splice(
258
+ git_str *str,
259
+ size_t where,
260
+ size_t nb_to_remove,
261
+ const char *data,
262
+ size_t nb_to_insert);
263
+
264
+ /**
265
+ * Append string to string buffer, prefixing each character from
266
+ * `esc_chars` with `esc_with` string.
267
+ *
268
+ * @param str String buffer to append data to
269
+ * @param string String to escape and append
270
+ * @param esc_chars Characters to be escaped
271
+ * @param esc_with String to insert in from of each found character
272
+ * @return 0 on success, <0 on failure (probably allocation problem)
273
+ */
274
+ extern int git_str_puts_escaped(
275
+ git_str *str,
276
+ const char *string,
277
+ const char *esc_chars,
278
+ const char *esc_with);
279
+
280
+ /**
281
+ * Append string escaping characters that are regex special
282
+ */
283
+ GIT_INLINE(int) git_str_puts_escape_regex(git_str *str, const char *string)
284
+ {
285
+ return git_str_puts_escaped(str, string, "^.[]$()|*+?{}\\", "\\");
286
+ }
287
+
288
+ /**
289
+ * Unescape all characters in a string buffer in place
290
+ *
291
+ * I.e. remove backslashes
292
+ */
293
+ extern void git_str_unescape(git_str *str);
294
+
295
+ /**
296
+ * Replace all \r\n with \n.
297
+ *
298
+ * @return 0 on success, -1 on memory error
299
+ */
300
+ extern int git_str_crlf_to_lf(git_str *tgt, const git_str *src);
301
+
302
+ /**
303
+ * Replace all \n with \r\n. Does not modify existing \r\n.
304
+ *
305
+ * @return 0 on success, -1 on memory error
306
+ */
307
+ extern int git_str_lf_to_crlf(git_str *tgt, const git_str *src);
308
+
309
+ /**
310
+ * Fill string buffer with the common prefix of a array of strings
311
+ *
312
+ * String buffer will be set to empty if there is no common prefix
313
+ */
314
+ extern int git_str_common_prefix(git_str *buf, char *const *const strings, size_t count);
315
+
316
+ /**
317
+ * Check if a string buffer begins with a UTF BOM
318
+ *
319
+ * @param bom Set to the type of BOM detected or GIT_BOM_NONE
320
+ * @param str String buffer in which to check the first bytes for a BOM
321
+ * @return Number of bytes of BOM data (or 0 if no BOM found)
322
+ */
323
+ extern int git_str_detect_bom(git_str_bom_t *bom, const git_str *str);
324
+
325
+ /**
326
+ * Gather stats for a piece of text
327
+ *
328
+ * Fill the `stats` structure with counts of unreadable characters, carriage
329
+ * returns, etc, so it can be used in heuristics. This automatically skips
330
+ * a trailing EOF (\032 character). Also it will look for a BOM at the
331
+ * start of the text and can be told to skip that as well.
332
+ *
333
+ * @param stats Structure to be filled in
334
+ * @param str Text to process
335
+ * @param skip_bom Exclude leading BOM from stats if true
336
+ * @return Does the string buffer heuristically look like binary data
337
+ */
338
+ extern bool git_str_gather_text_stats(
339
+ git_str_text_stats *stats, const git_str *str, bool skip_bom);
340
+
341
+ /**
342
+ * Check quickly if string buffer looks like it contains binary data
343
+ *
344
+ * @param str string buffer to check
345
+ * @return 1 if string buffer looks like non-text data
346
+ */
347
+ int git_str_is_binary(const git_str *str);
348
+
349
+ /**
350
+ * Check quickly if buffer contains a NUL byte
351
+ *
352
+ * @param str string buffer to check
353
+ * @return 1 if string buffer contains a NUL byte
354
+ */
355
+ int git_str_contains_nul(const git_str *str);
356
+
357
+ #endif
@@ -7,7 +7,7 @@
7
7
  #ifndef INCLUDE_strmap_h__
8
8
  #define INCLUDE_strmap_h__
9
9
 
10
- #include "common.h"
10
+ #include "git2_util.h"
11
11
 
12
12
  /** A map with C strings as key. */
13
13
  typedef struct kh_str_s git_strmap;
@@ -5,7 +5,7 @@
5
5
  * a Linking Exception. For full terms see the included COPYING file.
6
6
  */
7
7
 
8
- #include "common.h"
8
+ #include "git2_util.h"
9
9
 
10
10
  #if !defined(GIT_THREADS)
11
11
 
@@ -12,7 +12,7 @@
12
12
  #if defined(__clang__)
13
13
 
14
14
  # if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 1))
15
- # error Atomic primitives do not exist on this version of clang; configure libgit2 with -DTHREADSAFE=OFF
15
+ # error Atomic primitives do not exist on this version of clang; configure libgit2 with -DUSE_THREADS=OFF
16
16
  # else
17
17
  # define GIT_BUILTIN_ATOMIC
18
18
  # endif
@@ -20,7 +20,7 @@
20
20
  #elif defined(__GNUC__)
21
21
 
22
22
  # if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
23
- # error Atomic primitives do not exist on this version of gcc; configure libgit2 with -DTHREADSAFE=OFF
23
+ # error Atomic primitives do not exist on this version of gcc; configure libgit2 with -DUSE_THREADS=OFF
24
24
  # elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
25
25
  # define GIT_BUILTIN_ATOMIC
26
26
  # else
@@ -180,7 +180,7 @@ GIT_INLINE(volatile void *) git_atomic__swap(
180
180
  #if defined(GIT_WIN32)
181
181
  return InterlockedExchangePointer(ptr, newval);
182
182
  #elif defined(GIT_BUILTIN_ATOMIC)
183
- void * volatile foundval = NULL;
183
+ void * foundval = NULL;
184
184
  __atomic_exchange(ptr, &newval, &foundval, __ATOMIC_SEQ_CST);
185
185
  return foundval;
186
186
  #elif defined(GIT_BUILTIN_SYNC)
@@ -260,36 +260,37 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
260
260
 
261
261
  #else
262
262
 
263
- #define git_threads_global_init git__noop
263
+ #define git_threads_global_init git__noop
264
264
 
265
265
  #define git_thread unsigned int
266
- #define git_thread_create(thread, start_routine, arg) git__noop()
267
- #define git_thread_join(id, status) git__noop()
266
+ #define git_thread_create(t, s, a) git__noop(t, s, a)
267
+ #define git_thread_join(i, s) git__noop_args(i, s)
268
268
 
269
269
  /* Pthreads Mutex */
270
270
  #define git_mutex unsigned int
271
- #define git_mutex_init(a) git__noop()
272
- #define git_mutex_init(a) git__noop()
273
- #define git_mutex_lock(a) git__noop()
274
- #define git_mutex_unlock(a) git__noop()
275
- #define git_mutex_free(a) git__noop()
271
+ #define git_mutex_init(a) git__noop_args(a)
272
+ #define git_mutex_init(a) git__noop_args(a)
273
+ #define git_mutex_lock(a) git__noop_args(a)
274
+ #define git_mutex_unlock(a) git__noop_args(a)
275
+ #define git_mutex_free(a) git__noop_args(a)
276
276
 
277
277
  /* Pthreads condition vars */
278
278
  #define git_cond unsigned int
279
- #define git_cond_init(c) git__noop()
280
- #define git_cond_free(c) git__noop()
281
- #define git_cond_wait(c, l) git__noop()
282
- #define git_cond_signal(c) git__noop()
283
- #define git_cond_broadcast(c) git__noop()
279
+ #define git_cond_init(c) git__noop_args(c)
280
+ #define git_cond_free(c) git__noop_args(c)
281
+ #define git_cond_wait(c, l) git__noop_args(c, l)
282
+ #define git_cond_signal(c) git__noop_args(c)
283
+ #define git_cond_broadcast(c) git__noop_args(c)
284
284
 
285
285
  /* Pthreads rwlock */
286
286
  #define git_rwlock unsigned int
287
- #define git_rwlock_init(a) git__noop()
288
- #define git_rwlock_rdlock(a) git__noop()
289
- #define git_rwlock_rdunlock(a) git__noop()
290
- #define git_rwlock_wrlock(a) git__noop()
291
- #define git_rwlock_wrunlock(a) git__noop()
292
- #define git_rwlock_free(a) git__noop()
287
+ #define git_rwlock_init(a) git__noop_args(a)
288
+ #define git_rwlock_rdlock(a) git__noop_args(a)
289
+ #define git_rwlock_rdunlock(a) git__noop_args(a)
290
+ #define git_rwlock_wrlock(a) git__noop_args(a)
291
+ #define git_rwlock_wrunlock(a) git__noop_args(a)
292
+ #define git_rwlock_free(a) git__noop_args(a)
293
+
293
294
  #define GIT_RWLOCK_STATIC_INIT 0
294
295
 
295
296
 
@@ -5,7 +5,7 @@
5
5
  * a Linking Exception. For full terms see the included COPYING file.
6
6
  */
7
7
 
8
- #include "common.h"
8
+ #include "git2_util.h"
9
9
 
10
10
  /**
11
11
  * An array-of-pointers implementation of Python's Timsort
@@ -5,9 +5,7 @@
5
5
  * a Linking Exception. For full terms see the included COPYING file.
6
6
  */
7
7
 
8
- #include "common.h"
9
-
10
- #include "git2/common.h"
8
+ #include "git2_util.h"
11
9
 
12
10
  #if !defined(GIT_WIN32) && !defined(NO_MMAP)
13
11
 
@@ -7,9 +7,7 @@
7
7
  #ifndef INCLUDE_unix_posix_h__
8
8
  #define INCLUDE_unix_posix_h__
9
9
 
10
- #ifndef LIBGIT2_NO_FEATURES_H
11
- # include "git2/sys/features.h"
12
- #endif
10
+ #include "git2_util.h"
13
11
 
14
12
  #include <stdio.h>
15
13
  #include <dirent.h>
@@ -60,7 +58,6 @@ GIT_INLINE(int) p_fsync(int fd)
60
58
  #define p_strncasecmp(s1, s2, c) strncasecmp(s1, s2, c)
61
59
  #define p_vsnprintf(b, c, f, a) vsnprintf(b, c, f, a)
62
60
  #define p_snprintf snprintf
63
- #define p_mkstemp(p) mkstemp(p)
64
61
  #define p_chdir(p) chdir(p)
65
62
  #define p_rmdir(p) rmdir(p)
66
63
  #define p_access(p,m) access(p,m)
@@ -5,9 +5,7 @@
5
5
  * a Linking Exception. For full terms see the included COPYING file.
6
6
  */
7
7
 
8
- #include "common.h"
9
-
10
- #include "git2/common.h"
8
+ #include "git2_util.h"
11
9
 
12
10
  #ifndef GIT_WIN32
13
11
 
@@ -7,7 +7,7 @@
7
7
 
8
8
  #include "utf8.h"
9
9
 
10
- #include "common.h"
10
+ #include "git2_util.h"
11
11
 
12
12
  /*
13
13
  * git_utf8_iterate is taken from the utf8proc project,
@@ -7,7 +7,7 @@
7
7
  #ifndef INCLUDE_utf8_h__
8
8
  #define INCLUDE_utf8_h__
9
9
 
10
- #include "common.h"
10
+ #include "git2_util.h"
11
11
 
12
12
  /*
13
13
  * Iterate through an UTF-8 string, yielding one codepoint at a time.
@@ -7,7 +7,7 @@
7
7
 
8
8
  #include "util.h"
9
9
 
10
- #include "common.h"
10
+ #include "git2_util.h"
11
11
 
12
12
  #ifdef GIT_WIN32
13
13
  # include "win32/utf-conv.h"
@@ -18,7 +18,7 @@
18
18
  # endif
19
19
  # include <windows.h>
20
20
 
21
- # ifdef HAVE_QSORT_S
21
+ # ifdef GIT_QSORT_S
22
22
  # include <search.h>
23
23
  # endif
24
24
  #endif
@@ -673,7 +673,7 @@ size_t git__unescape(char *str)
673
673
  return (pos - str);
674
674
  }
675
675
 
676
- #if defined(HAVE_QSORT_S) || defined(HAVE_QSORT_R_BSD)
676
+ #if defined(GIT_QSORT_S) || defined(GIT_QSORT_R_BSD)
677
677
  typedef struct {
678
678
  git__sort_r_cmp cmp;
679
679
  void *payload;
@@ -688,9 +688,9 @@ static int GIT_LIBGIT2_CALL git__qsort_r_glue_cmp(
688
688
  #endif
689
689
 
690
690
 
691
- #if !defined(HAVE_QSORT_R_BSD) && \
692
- !defined(HAVE_QSORT_R_GNU) && \
693
- !defined(HAVE_QSORT_S)
691
+ #if !defined(GIT_QSORT_R_BSD) && \
692
+ !defined(GIT_QSORT_R_GNU) && \
693
+ !defined(GIT_QSORT_S)
694
694
  static void swap(uint8_t *a, uint8_t *b, size_t elsize)
695
695
  {
696
696
  char tmp[256];
@@ -721,12 +721,12 @@ static void insertsort(
721
721
  void git__qsort_r(
722
722
  void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload)
723
723
  {
724
- #if defined(HAVE_QSORT_R_BSD)
724
+ #if defined(GIT_QSORT_R_BSD)
725
725
  git__qsort_r_glue glue = { cmp, payload };
726
726
  qsort_r(els, nel, elsize, &glue, git__qsort_r_glue_cmp);
727
- #elif defined(HAVE_QSORT_R_GNU)
727
+ #elif defined(GIT_QSORT_R_GNU)
728
728
  qsort_r(els, nel, elsize, cmp, payload);
729
- #elif defined(HAVE_QSORT_S)
729
+ #elif defined(GIT_QSORT_S)
730
730
  git__qsort_r_glue glue = { cmp, payload };
731
731
  qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue);
732
732
  #else
@@ -735,13 +735,13 @@ void git__qsort_r(
735
735
  }
736
736
 
737
737
  #ifdef GIT_WIN32
738
- int git__getenv(git_buf *out, const char *name)
738
+ int git__getenv(git_str *out, const char *name)
739
739
  {
740
740
  wchar_t *wide_name = NULL, *wide_value = NULL;
741
741
  DWORD value_len;
742
742
  int error = -1;
743
743
 
744
- git_buf_clear(out);
744
+ git_str_clear(out);
745
745
 
746
746
  if (git__utf8_to_16_alloc(&wide_name, name) < 0)
747
747
  return -1;
@@ -754,7 +754,7 @@ int git__getenv(git_buf *out, const char *name)
754
754
  }
755
755
 
756
756
  if (value_len)
757
- error = git_buf_put_w(out, wide_value, value_len);
757
+ error = git_str_put_w(out, wide_value, value_len);
758
758
  else if (GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_ENVVAR_NOT_FOUND)
759
759
  error = GIT_ENOTFOUND;
760
760
  else
@@ -765,16 +765,16 @@ int git__getenv(git_buf *out, const char *name)
765
765
  return error;
766
766
  }
767
767
  #else
768
- int git__getenv(git_buf *out, const char *name)
768
+ int git__getenv(git_str *out, const char *name)
769
769
  {
770
770
  const char *val = getenv(name);
771
771
 
772
- git_buf_clear(out);
772
+ git_str_clear(out);
773
773
 
774
774
  if (!val)
775
775
  return GIT_ENOTFOUND;
776
776
 
777
- return git_buf_puts(out, val);
777
+ return git_str_puts(out, val);
778
778
  }
779
779
  #endif
780
780