rugged 0.28.5 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (411) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/ext/rugged/extconf.rb +3 -1
  4. data/ext/rugged/rugged.c +35 -31
  5. data/ext/rugged/rugged.h +13 -0
  6. data/ext/rugged/rugged_blob.c +11 -9
  7. data/ext/rugged/rugged_commit.c +18 -16
  8. data/ext/rugged/rugged_config.c +1 -1
  9. data/ext/rugged/rugged_diff.c +4 -26
  10. data/ext/rugged/rugged_index.c +4 -2
  11. data/ext/rugged/rugged_note.c +5 -3
  12. data/ext/rugged/rugged_object.c +57 -10
  13. data/ext/rugged/rugged_rebase.c +3 -1
  14. data/ext/rugged/rugged_remote.c +32 -8
  15. data/ext/rugged/rugged_repo.c +232 -17
  16. data/ext/rugged/rugged_tag.c +8 -6
  17. data/ext/rugged/rugged_tree.c +18 -16
  18. data/lib/rugged/commit.rb +17 -4
  19. data/lib/rugged/repository.rb +5 -6
  20. data/lib/rugged/submodule_collection.rb +4 -4
  21. data/lib/rugged/version.rb +1 -1
  22. data/vendor/libgit2/CMakeLists.txt +57 -75
  23. data/vendor/libgit2/COPYING +28 -0
  24. data/vendor/libgit2/cmake/{Modules/AddCFlagIfSupported.cmake → AddCFlagIfSupported.cmake} +0 -0
  25. data/vendor/libgit2/cmake/{Modules/EnableWarnings.cmake → EnableWarnings.cmake} +5 -1
  26. data/vendor/libgit2/cmake/{Modules/FindCoreFoundation.cmake → FindCoreFoundation.cmake} +2 -2
  27. data/vendor/libgit2/cmake/{Modules/FindGSSAPI.cmake → FindGSSAPI.cmake} +1 -1
  28. data/vendor/libgit2/cmake/FindGSSFramework.cmake +28 -0
  29. data/vendor/libgit2/cmake/{Modules/FindHTTP_Parser.cmake → FindHTTP_Parser.cmake} +0 -0
  30. data/vendor/libgit2/cmake/{Modules/FindIconv.cmake → FindIconv.cmake} +0 -0
  31. data/vendor/libgit2/cmake/FindPCRE.cmake +38 -0
  32. data/vendor/libgit2/cmake/FindPCRE2.cmake +37 -0
  33. data/vendor/libgit2/cmake/{Modules/FindPkgLibraries.cmake → FindPkgLibraries.cmake} +0 -0
  34. data/vendor/libgit2/cmake/{Modules/FindSecurity.cmake → FindSecurity.cmake} +2 -2
  35. data/vendor/libgit2/cmake/{Modules/FindStatNsec.cmake → FindStatNsec.cmake} +6 -0
  36. data/vendor/libgit2/cmake/{Modules/FindmbedTLS.cmake → FindmbedTLS.cmake} +0 -0
  37. data/vendor/libgit2/cmake/{Modules/IdeSplitSources.cmake → IdeSplitSources.cmake} +0 -0
  38. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +77 -0
  39. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -0
  40. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +48 -0
  41. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +120 -0
  42. data/vendor/libgit2/cmake/SelectHashes.cmake +61 -0
  43. data/vendor/libgit2/deps/http-parser/CMakeLists.txt +4 -3
  44. data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
  45. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +25 -0
  46. data/vendor/libgit2/deps/ntlmclient/compat.h +28 -0
  47. data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
  48. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
  49. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
  50. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
  51. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
  52. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
  53. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
  54. data/vendor/libgit2/deps/ntlmclient/ntlm.c +1419 -0
  55. data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
  56. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
  57. data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
  58. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
  59. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
  60. data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
  61. data/vendor/libgit2/deps/ntlmclient/util.c +35 -0
  62. data/vendor/libgit2/deps/ntlmclient/util.h +15 -0
  63. data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
  64. data/vendor/libgit2/deps/pcre/COPYING +5 -0
  65. data/vendor/libgit2/deps/pcre/LICENCE +93 -0
  66. data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
  67. data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
  68. data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
  69. data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
  70. data/vendor/libgit2/deps/pcre/config.h.in +57 -0
  71. data/vendor/libgit2/deps/pcre/pcre.h +641 -0
  72. data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
  73. data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
  74. data/vendor/libgit2/deps/pcre/pcre_compile.c +9812 -0
  75. data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
  76. data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
  77. data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
  78. data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
  79. data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
  80. data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
  81. data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
  82. data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
  83. data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
  84. data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
  85. data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
  86. data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
  87. data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
  88. data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
  89. data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
  90. data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
  91. data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
  92. data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
  93. data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
  94. data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
  95. data/vendor/libgit2/deps/pcre/pcreposix.c +420 -0
  96. data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
  97. data/vendor/libgit2/deps/pcre/ucp.h +224 -0
  98. data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -5
  99. data/vendor/libgit2/deps/zlib/adler32.c +0 -7
  100. data/vendor/libgit2/deps/zlib/crc32.c +0 -7
  101. data/vendor/libgit2/deps/zlib/deflate.c +1 -0
  102. data/vendor/libgit2/include/git2.h +2 -0
  103. data/vendor/libgit2/include/git2/annotated_commit.h +1 -1
  104. data/vendor/libgit2/include/git2/apply.h +24 -2
  105. data/vendor/libgit2/include/git2/attr.h +23 -13
  106. data/vendor/libgit2/include/git2/blame.h +4 -2
  107. data/vendor/libgit2/include/git2/blob.h +61 -13
  108. data/vendor/libgit2/include/git2/branch.h +74 -57
  109. data/vendor/libgit2/include/git2/buffer.h +20 -14
  110. data/vendor/libgit2/include/git2/cert.h +135 -0
  111. data/vendor/libgit2/include/git2/checkout.h +46 -14
  112. data/vendor/libgit2/include/git2/cherrypick.h +3 -3
  113. data/vendor/libgit2/include/git2/clone.h +2 -2
  114. data/vendor/libgit2/include/git2/commit.h +23 -1
  115. data/vendor/libgit2/include/git2/common.h +34 -8
  116. data/vendor/libgit2/include/git2/config.h +13 -13
  117. data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
  118. data/vendor/libgit2/include/git2/credential.h +314 -0
  119. data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
  120. data/vendor/libgit2/include/git2/deprecated.h +362 -4
  121. data/vendor/libgit2/include/git2/describe.h +4 -4
  122. data/vendor/libgit2/include/git2/diff.h +17 -15
  123. data/vendor/libgit2/include/git2/errors.h +5 -2
  124. data/vendor/libgit2/include/git2/filter.h +8 -0
  125. data/vendor/libgit2/include/git2/index.h +5 -5
  126. data/vendor/libgit2/include/git2/indexer.h +49 -4
  127. data/vendor/libgit2/include/git2/merge.h +6 -10
  128. data/vendor/libgit2/include/git2/net.h +0 -5
  129. data/vendor/libgit2/include/git2/object.h +2 -14
  130. data/vendor/libgit2/include/git2/odb.h +18 -22
  131. data/vendor/libgit2/include/git2/odb_backend.h +5 -4
  132. data/vendor/libgit2/include/git2/oid.h +11 -6
  133. data/vendor/libgit2/include/git2/pack.h +13 -2
  134. data/vendor/libgit2/include/git2/proxy.h +6 -4
  135. data/vendor/libgit2/include/git2/rebase.h +46 -2
  136. data/vendor/libgit2/include/git2/refs.h +22 -3
  137. data/vendor/libgit2/include/git2/remote.h +40 -15
  138. data/vendor/libgit2/include/git2/repository.h +124 -58
  139. data/vendor/libgit2/include/git2/revert.h +1 -1
  140. data/vendor/libgit2/include/git2/revwalk.h +7 -3
  141. data/vendor/libgit2/include/git2/stash.h +4 -4
  142. data/vendor/libgit2/include/git2/status.h +25 -16
  143. data/vendor/libgit2/include/git2/strarray.h +6 -10
  144. data/vendor/libgit2/include/git2/submodule.h +20 -3
  145. data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
  146. data/vendor/libgit2/include/git2/sys/cred.h +15 -0
  147. data/vendor/libgit2/include/git2/sys/credential.h +90 -0
  148. data/vendor/libgit2/include/git2/sys/index.h +4 -2
  149. data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
  150. data/vendor/libgit2/include/git2/sys/merge.h +1 -1
  151. data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
  152. data/vendor/libgit2/include/git2/sys/refdb_backend.h +164 -21
  153. data/vendor/libgit2/include/git2/sys/repository.h +17 -6
  154. data/vendor/libgit2/include/git2/sys/transport.h +4 -4
  155. data/vendor/libgit2/include/git2/tag.h +11 -2
  156. data/vendor/libgit2/include/git2/trace.h +2 -2
  157. data/vendor/libgit2/include/git2/transport.h +11 -340
  158. data/vendor/libgit2/include/git2/tree.h +7 -3
  159. data/vendor/libgit2/include/git2/types.h +4 -89
  160. data/vendor/libgit2/include/git2/version.h +5 -5
  161. data/vendor/libgit2/include/git2/worktree.h +5 -5
  162. data/vendor/libgit2/src/CMakeLists.txt +147 -272
  163. data/vendor/libgit2/src/alloc.c +2 -14
  164. data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
  165. data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
  166. data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
  167. data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
  168. data/vendor/libgit2/src/apply.c +36 -16
  169. data/vendor/libgit2/src/assert_safe.h +58 -0
  170. data/vendor/libgit2/src/attr.c +70 -64
  171. data/vendor/libgit2/src/attr_file.c +197 -99
  172. data/vendor/libgit2/src/attr_file.h +9 -9
  173. data/vendor/libgit2/src/attrcache.c +48 -49
  174. data/vendor/libgit2/src/attrcache.h +2 -1
  175. data/vendor/libgit2/src/blame.c +34 -15
  176. data/vendor/libgit2/src/blame.h +1 -1
  177. data/vendor/libgit2/src/blame_git.c +27 -10
  178. data/vendor/libgit2/src/blob.c +92 -17
  179. data/vendor/libgit2/src/blob.h +2 -2
  180. data/vendor/libgit2/src/branch.c +68 -42
  181. data/vendor/libgit2/src/buffer.c +11 -3
  182. data/vendor/libgit2/src/buffer.h +1 -0
  183. data/vendor/libgit2/src/cache.c +34 -58
  184. data/vendor/libgit2/src/cache.h +1 -1
  185. data/vendor/libgit2/src/cc-compat.h +5 -0
  186. data/vendor/libgit2/src/checkout.c +73 -86
  187. data/vendor/libgit2/src/cherrypick.c +9 -1
  188. data/vendor/libgit2/src/clone.c +130 -27
  189. data/vendor/libgit2/src/clone.h +4 -0
  190. data/vendor/libgit2/src/commit.c +70 -22
  191. data/vendor/libgit2/src/commit.h +6 -0
  192. data/vendor/libgit2/src/commit_list.c +28 -76
  193. data/vendor/libgit2/src/commit_list.h +2 -2
  194. data/vendor/libgit2/src/common.h +4 -75
  195. data/vendor/libgit2/src/config.c +34 -47
  196. data/vendor/libgit2/src/config.h +7 -6
  197. data/vendor/libgit2/src/config_backend.h +12 -0
  198. data/vendor/libgit2/src/config_cache.c +42 -39
  199. data/vendor/libgit2/src/config_entries.c +76 -98
  200. data/vendor/libgit2/src/config_entries.h +1 -0
  201. data/vendor/libgit2/src/config_file.c +346 -380
  202. data/vendor/libgit2/src/config_mem.c +12 -16
  203. data/vendor/libgit2/src/config_parse.c +50 -30
  204. data/vendor/libgit2/src/config_parse.h +13 -12
  205. data/vendor/libgit2/src/config_snapshot.c +207 -0
  206. data/vendor/libgit2/src/crlf.c +14 -14
  207. data/vendor/libgit2/src/describe.c +26 -21
  208. data/vendor/libgit2/src/diff.c +53 -75
  209. data/vendor/libgit2/src/diff.h +4 -3
  210. data/vendor/libgit2/src/diff_driver.c +37 -38
  211. data/vendor/libgit2/src/diff_file.c +15 -11
  212. data/vendor/libgit2/src/diff_file.h +2 -2
  213. data/vendor/libgit2/src/diff_generate.c +36 -37
  214. data/vendor/libgit2/src/diff_generate.h +2 -2
  215. data/vendor/libgit2/src/diff_parse.c +3 -4
  216. data/vendor/libgit2/src/diff_print.c +86 -71
  217. data/vendor/libgit2/src/diff_stats.c +13 -12
  218. data/vendor/libgit2/src/diff_tform.c +15 -16
  219. data/vendor/libgit2/src/errors.c +23 -25
  220. data/vendor/libgit2/src/errors.h +81 -0
  221. data/vendor/libgit2/src/features.h.in +9 -2
  222. data/vendor/libgit2/src/fetch.c +9 -2
  223. data/vendor/libgit2/src/fetchhead.c +9 -9
  224. data/vendor/libgit2/src/filebuf.c +1 -1
  225. data/vendor/libgit2/src/filebuf.h +1 -1
  226. data/vendor/libgit2/src/filter.c +19 -11
  227. data/vendor/libgit2/src/{fileops.c → futils.c} +23 -20
  228. data/vendor/libgit2/src/{fileops.h → futils.h} +8 -8
  229. data/vendor/libgit2/src/global.c +3 -1
  230. data/vendor/libgit2/src/hash.c +61 -0
  231. data/vendor/libgit2/src/hash.h +19 -21
  232. data/vendor/libgit2/src/hash/sha1.h +38 -0
  233. data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
  234. data/vendor/libgit2/src/{sha1_lookup.h → hash/sha1/collisiondetect.h} +8 -8
  235. data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
  236. data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
  237. data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
  238. data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
  239. data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
  240. data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
  241. data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
  242. data/vendor/libgit2/src/{refdb_fs.h → hash/sha1/openssl.h} +8 -8
  243. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
  244. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
  245. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
  246. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
  247. data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
  248. data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
  249. data/vendor/libgit2/src/hashsig.c +1 -1
  250. data/vendor/libgit2/src/idxmap.c +73 -69
  251. data/vendor/libgit2/src/idxmap.h +151 -15
  252. data/vendor/libgit2/src/ignore.c +26 -35
  253. data/vendor/libgit2/src/index.c +123 -95
  254. data/vendor/libgit2/src/index.h +1 -1
  255. data/vendor/libgit2/src/indexer.c +99 -78
  256. data/vendor/libgit2/src/integer.h +26 -4
  257. data/vendor/libgit2/src/iterator.c +36 -32
  258. data/vendor/libgit2/src/iterator.h +8 -8
  259. data/vendor/libgit2/src/map.h +1 -1
  260. data/vendor/libgit2/src/merge.c +93 -57
  261. data/vendor/libgit2/src/merge.h +2 -2
  262. data/vendor/libgit2/src/merge_driver.c +5 -5
  263. data/vendor/libgit2/src/merge_file.c +5 -7
  264. data/vendor/libgit2/src/midx.c +418 -0
  265. data/vendor/libgit2/src/midx.h +83 -0
  266. data/vendor/libgit2/src/mwindow.c +144 -74
  267. data/vendor/libgit2/src/mwindow.h +4 -4
  268. data/vendor/libgit2/src/net.c +416 -0
  269. data/vendor/libgit2/src/net.h +57 -0
  270. data/vendor/libgit2/src/netops.c +6 -222
  271. data/vendor/libgit2/src/netops.h +1 -37
  272. data/vendor/libgit2/src/notes.c +8 -5
  273. data/vendor/libgit2/src/object.c +5 -4
  274. data/vendor/libgit2/src/object.h +2 -0
  275. data/vendor/libgit2/src/odb.c +54 -32
  276. data/vendor/libgit2/src/odb.h +3 -2
  277. data/vendor/libgit2/src/odb_loose.c +20 -13
  278. data/vendor/libgit2/src/odb_mempack.c +15 -24
  279. data/vendor/libgit2/src/odb_pack.c +4 -5
  280. data/vendor/libgit2/src/offmap.c +43 -55
  281. data/vendor/libgit2/src/offmap.h +102 -24
  282. data/vendor/libgit2/src/oid.c +21 -8
  283. data/vendor/libgit2/src/oidmap.c +39 -57
  284. data/vendor/libgit2/src/oidmap.h +99 -19
  285. data/vendor/libgit2/src/pack-objects.c +55 -52
  286. data/vendor/libgit2/src/pack-objects.h +1 -1
  287. data/vendor/libgit2/src/pack.c +160 -149
  288. data/vendor/libgit2/src/pack.h +32 -18
  289. data/vendor/libgit2/src/parse.c +10 -0
  290. data/vendor/libgit2/src/parse.h +3 -3
  291. data/vendor/libgit2/src/patch.c +1 -1
  292. data/vendor/libgit2/src/patch_generate.c +2 -4
  293. data/vendor/libgit2/src/patch_parse.c +34 -11
  294. data/vendor/libgit2/src/path.c +47 -10
  295. data/vendor/libgit2/src/path.h +2 -0
  296. data/vendor/libgit2/src/pathspec.c +18 -17
  297. data/vendor/libgit2/src/pool.c +42 -32
  298. data/vendor/libgit2/src/pool.h +15 -7
  299. data/vendor/libgit2/src/posix.c +39 -16
  300. data/vendor/libgit2/src/posix.h +21 -1
  301. data/vendor/libgit2/src/proxy.c +9 -2
  302. data/vendor/libgit2/src/push.c +15 -7
  303. data/vendor/libgit2/src/reader.c +2 -2
  304. data/vendor/libgit2/src/rebase.c +89 -28
  305. data/vendor/libgit2/src/refdb.c +147 -0
  306. data/vendor/libgit2/src/refdb.h +69 -0
  307. data/vendor/libgit2/src/refdb_fs.c +230 -241
  308. data/vendor/libgit2/src/reflog.c +13 -19
  309. data/vendor/libgit2/src/refs.c +113 -217
  310. data/vendor/libgit2/src/refs.h +10 -21
  311. data/vendor/libgit2/src/refspec.c +57 -48
  312. data/vendor/libgit2/src/regexp.c +221 -0
  313. data/vendor/libgit2/src/regexp.h +97 -0
  314. data/vendor/libgit2/src/remote.c +102 -79
  315. data/vendor/libgit2/src/remote.h +2 -2
  316. data/vendor/libgit2/src/repository.c +322 -203
  317. data/vendor/libgit2/src/repository.h +49 -57
  318. data/vendor/libgit2/src/revert.c +8 -1
  319. data/vendor/libgit2/src/revparse.c +23 -23
  320. data/vendor/libgit2/src/revwalk.c +73 -37
  321. data/vendor/libgit2/src/revwalk.h +20 -0
  322. data/vendor/libgit2/src/settings.c +22 -1
  323. data/vendor/libgit2/src/sortedcache.c +14 -29
  324. data/vendor/libgit2/src/sortedcache.h +1 -1
  325. data/vendor/libgit2/src/stash.c +49 -67
  326. data/vendor/libgit2/src/status.c +19 -11
  327. data/vendor/libgit2/src/strarray.c +63 -0
  328. data/vendor/libgit2/src/streams/openssl.c +66 -8
  329. data/vendor/libgit2/src/streams/registry.c +5 -3
  330. data/vendor/libgit2/src/streams/socket.c +2 -2
  331. data/vendor/libgit2/src/strmap.c +37 -84
  332. data/vendor/libgit2/src/strmap.h +105 -33
  333. data/vendor/libgit2/src/submodule.c +157 -130
  334. data/vendor/libgit2/src/submodule.h +1 -1
  335. data/vendor/libgit2/src/sysdir.c +4 -20
  336. data/vendor/libgit2/src/sysdir.h +0 -11
  337. data/vendor/libgit2/src/tag.c +12 -2
  338. data/vendor/libgit2/src/thread-utils.h +163 -40
  339. data/vendor/libgit2/src/trace.c +1 -1
  340. data/vendor/libgit2/src/trace.h +3 -3
  341. data/vendor/libgit2/src/trailer.c +46 -32
  342. data/vendor/libgit2/src/transaction.c +5 -9
  343. data/vendor/libgit2/src/transports/auth.c +16 -15
  344. data/vendor/libgit2/src/transports/auth.h +18 -11
  345. data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
  346. data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
  347. data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
  348. data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
  349. data/vendor/libgit2/src/transports/credential.c +478 -0
  350. data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +23 -8
  351. data/vendor/libgit2/src/transports/git.c +11 -16
  352. data/vendor/libgit2/src/transports/http.c +488 -1248
  353. data/vendor/libgit2/src/transports/http.h +4 -1
  354. data/vendor/libgit2/src/transports/httpclient.c +1552 -0
  355. data/vendor/libgit2/src/transports/httpclient.h +190 -0
  356. data/vendor/libgit2/src/transports/local.c +12 -12
  357. data/vendor/libgit2/src/transports/smart.c +21 -21
  358. data/vendor/libgit2/src/transports/smart.h +3 -3
  359. data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
  360. data/vendor/libgit2/src/transports/ssh.c +77 -59
  361. data/vendor/libgit2/src/transports/winhttp.c +368 -285
  362. data/vendor/libgit2/src/tree-cache.c +14 -7
  363. data/vendor/libgit2/src/tree.c +16 -26
  364. data/vendor/libgit2/src/unix/map.c +1 -1
  365. data/vendor/libgit2/src/unix/posix.h +16 -11
  366. data/vendor/libgit2/src/userdiff.h +3 -1
  367. data/vendor/libgit2/src/util.c +75 -110
  368. data/vendor/libgit2/src/util.h +18 -23
  369. data/vendor/libgit2/src/wildmatch.c +320 -0
  370. data/vendor/libgit2/src/wildmatch.h +23 -0
  371. data/vendor/libgit2/src/win32/git2.rc +18 -3
  372. data/vendor/libgit2/src/win32/map.c +3 -5
  373. data/vendor/libgit2/src/win32/path_w32.c +42 -5
  374. data/vendor/libgit2/src/win32/path_w32.h +15 -29
  375. data/vendor/libgit2/src/win32/posix.h +1 -4
  376. data/vendor/libgit2/src/win32/posix_w32.c +117 -5
  377. data/vendor/libgit2/src/win32/precompiled.h +0 -2
  378. data/vendor/libgit2/src/win32/thread.c +5 -5
  379. data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
  380. data/vendor/libgit2/src/win32/w32_common.h +39 -0
  381. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
  382. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
  383. data/vendor/libgit2/src/win32/w32_stack.c +4 -9
  384. data/vendor/libgit2/src/win32/w32_stack.h +3 -3
  385. data/vendor/libgit2/src/win32/w32_util.c +31 -0
  386. data/vendor/libgit2/src/win32/w32_util.h +6 -32
  387. data/vendor/libgit2/src/worktree.c +91 -50
  388. data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
  389. data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
  390. data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
  391. data/vendor/libgit2/src/zstream.c +5 -0
  392. data/vendor/libgit2/src/zstream.h +1 -0
  393. metadata +123 -53
  394. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +0 -29
  395. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +0 -96
  396. data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
  397. data/vendor/libgit2/deps/regex/COPYING +0 -502
  398. data/vendor/libgit2/deps/regex/config.h +0 -7
  399. data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
  400. data/vendor/libgit2/deps/regex/regex.c +0 -92
  401. data/vendor/libgit2/deps/regex/regex.h +0 -582
  402. data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
  403. data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
  404. data/vendor/libgit2/deps/regex/regexec.c +0 -4369
  405. data/vendor/libgit2/include/git2/inttypes.h +0 -309
  406. data/vendor/libgit2/include/git2/sys/time.h +0 -31
  407. data/vendor/libgit2/libgit2.pc.in +0 -13
  408. data/vendor/libgit2/src/fnmatch.c +0 -248
  409. data/vendor/libgit2/src/fnmatch.h +0 -48
  410. data/vendor/libgit2/src/sha1_lookup.c +0 -35
  411. data/vendor/libgit2/src/transports/cred.c +0 -390
@@ -0,0 +1,224 @@
1
+ /*************************************************
2
+ * Unicode Property Table handler *
3
+ *************************************************/
4
+
5
+ #ifndef _UCP_H
6
+ #define _UCP_H
7
+
8
+ /* This file contains definitions of the property values that are returned by
9
+ the UCD access macros. New values that are added for new releases of Unicode
10
+ should always be at the end of each enum, for backwards compatibility.
11
+
12
+ IMPORTANT: Note also that the specific numeric values of the enums have to be
13
+ the same as the values that are generated by the maint/MultiStage2.py script,
14
+ where the equivalent property descriptive names are listed in vectors.
15
+
16
+ ALSO: The specific values of the first two enums are assumed for the table
17
+ called catposstab in pcre_compile.c. */
18
+
19
+ /* These are the general character categories. */
20
+
21
+ enum {
22
+ ucp_C, /* Other */
23
+ ucp_L, /* Letter */
24
+ ucp_M, /* Mark */
25
+ ucp_N, /* Number */
26
+ ucp_P, /* Punctuation */
27
+ ucp_S, /* Symbol */
28
+ ucp_Z /* Separator */
29
+ };
30
+
31
+ /* These are the particular character categories. */
32
+
33
+ enum {
34
+ ucp_Cc, /* Control */
35
+ ucp_Cf, /* Format */
36
+ ucp_Cn, /* Unassigned */
37
+ ucp_Co, /* Private use */
38
+ ucp_Cs, /* Surrogate */
39
+ ucp_Ll, /* Lower case letter */
40
+ ucp_Lm, /* Modifier letter */
41
+ ucp_Lo, /* Other letter */
42
+ ucp_Lt, /* Title case letter */
43
+ ucp_Lu, /* Upper case letter */
44
+ ucp_Mc, /* Spacing mark */
45
+ ucp_Me, /* Enclosing mark */
46
+ ucp_Mn, /* Non-spacing mark */
47
+ ucp_Nd, /* Decimal number */
48
+ ucp_Nl, /* Letter number */
49
+ ucp_No, /* Other number */
50
+ ucp_Pc, /* Connector punctuation */
51
+ ucp_Pd, /* Dash punctuation */
52
+ ucp_Pe, /* Close punctuation */
53
+ ucp_Pf, /* Final punctuation */
54
+ ucp_Pi, /* Initial punctuation */
55
+ ucp_Po, /* Other punctuation */
56
+ ucp_Ps, /* Open punctuation */
57
+ ucp_Sc, /* Currency symbol */
58
+ ucp_Sk, /* Modifier symbol */
59
+ ucp_Sm, /* Mathematical symbol */
60
+ ucp_So, /* Other symbol */
61
+ ucp_Zl, /* Line separator */
62
+ ucp_Zp, /* Paragraph separator */
63
+ ucp_Zs /* Space separator */
64
+ };
65
+
66
+ /* These are grapheme break properties. Note that the code for processing them
67
+ assumes that the values are less than 16. If more values are added that take
68
+ the number to 16 or more, the code will have to be rewritten. */
69
+
70
+ enum {
71
+ ucp_gbCR, /* 0 */
72
+ ucp_gbLF, /* 1 */
73
+ ucp_gbControl, /* 2 */
74
+ ucp_gbExtend, /* 3 */
75
+ ucp_gbPrepend, /* 4 */
76
+ ucp_gbSpacingMark, /* 5 */
77
+ ucp_gbL, /* 6 Hangul syllable type L */
78
+ ucp_gbV, /* 7 Hangul syllable type V */
79
+ ucp_gbT, /* 8 Hangul syllable type T */
80
+ ucp_gbLV, /* 9 Hangul syllable type LV */
81
+ ucp_gbLVT, /* 10 Hangul syllable type LVT */
82
+ ucp_gbRegionalIndicator, /* 11 */
83
+ ucp_gbOther /* 12 */
84
+ };
85
+
86
+ /* These are the script identifications. */
87
+
88
+ enum {
89
+ ucp_Arabic,
90
+ ucp_Armenian,
91
+ ucp_Bengali,
92
+ ucp_Bopomofo,
93
+ ucp_Braille,
94
+ ucp_Buginese,
95
+ ucp_Buhid,
96
+ ucp_Canadian_Aboriginal,
97
+ ucp_Cherokee,
98
+ ucp_Common,
99
+ ucp_Coptic,
100
+ ucp_Cypriot,
101
+ ucp_Cyrillic,
102
+ ucp_Deseret,
103
+ ucp_Devanagari,
104
+ ucp_Ethiopic,
105
+ ucp_Georgian,
106
+ ucp_Glagolitic,
107
+ ucp_Gothic,
108
+ ucp_Greek,
109
+ ucp_Gujarati,
110
+ ucp_Gurmukhi,
111
+ ucp_Han,
112
+ ucp_Hangul,
113
+ ucp_Hanunoo,
114
+ ucp_Hebrew,
115
+ ucp_Hiragana,
116
+ ucp_Inherited,
117
+ ucp_Kannada,
118
+ ucp_Katakana,
119
+ ucp_Kharoshthi,
120
+ ucp_Khmer,
121
+ ucp_Lao,
122
+ ucp_Latin,
123
+ ucp_Limbu,
124
+ ucp_Linear_B,
125
+ ucp_Malayalam,
126
+ ucp_Mongolian,
127
+ ucp_Myanmar,
128
+ ucp_New_Tai_Lue,
129
+ ucp_Ogham,
130
+ ucp_Old_Italic,
131
+ ucp_Old_Persian,
132
+ ucp_Oriya,
133
+ ucp_Osmanya,
134
+ ucp_Runic,
135
+ ucp_Shavian,
136
+ ucp_Sinhala,
137
+ ucp_Syloti_Nagri,
138
+ ucp_Syriac,
139
+ ucp_Tagalog,
140
+ ucp_Tagbanwa,
141
+ ucp_Tai_Le,
142
+ ucp_Tamil,
143
+ ucp_Telugu,
144
+ ucp_Thaana,
145
+ ucp_Thai,
146
+ ucp_Tibetan,
147
+ ucp_Tifinagh,
148
+ ucp_Ugaritic,
149
+ ucp_Yi,
150
+ /* New for Unicode 5.0: */
151
+ ucp_Balinese,
152
+ ucp_Cuneiform,
153
+ ucp_Nko,
154
+ ucp_Phags_Pa,
155
+ ucp_Phoenician,
156
+ /* New for Unicode 5.1: */
157
+ ucp_Carian,
158
+ ucp_Cham,
159
+ ucp_Kayah_Li,
160
+ ucp_Lepcha,
161
+ ucp_Lycian,
162
+ ucp_Lydian,
163
+ ucp_Ol_Chiki,
164
+ ucp_Rejang,
165
+ ucp_Saurashtra,
166
+ ucp_Sundanese,
167
+ ucp_Vai,
168
+ /* New for Unicode 5.2: */
169
+ ucp_Avestan,
170
+ ucp_Bamum,
171
+ ucp_Egyptian_Hieroglyphs,
172
+ ucp_Imperial_Aramaic,
173
+ ucp_Inscriptional_Pahlavi,
174
+ ucp_Inscriptional_Parthian,
175
+ ucp_Javanese,
176
+ ucp_Kaithi,
177
+ ucp_Lisu,
178
+ ucp_Meetei_Mayek,
179
+ ucp_Old_South_Arabian,
180
+ ucp_Old_Turkic,
181
+ ucp_Samaritan,
182
+ ucp_Tai_Tham,
183
+ ucp_Tai_Viet,
184
+ /* New for Unicode 6.0.0: */
185
+ ucp_Batak,
186
+ ucp_Brahmi,
187
+ ucp_Mandaic,
188
+ /* New for Unicode 6.1.0: */
189
+ ucp_Chakma,
190
+ ucp_Meroitic_Cursive,
191
+ ucp_Meroitic_Hieroglyphs,
192
+ ucp_Miao,
193
+ ucp_Sharada,
194
+ ucp_Sora_Sompeng,
195
+ ucp_Takri,
196
+ /* New for Unicode 7.0.0: */
197
+ ucp_Bassa_Vah,
198
+ ucp_Caucasian_Albanian,
199
+ ucp_Duployan,
200
+ ucp_Elbasan,
201
+ ucp_Grantha,
202
+ ucp_Khojki,
203
+ ucp_Khudawadi,
204
+ ucp_Linear_A,
205
+ ucp_Mahajani,
206
+ ucp_Manichaean,
207
+ ucp_Mende_Kikakui,
208
+ ucp_Modi,
209
+ ucp_Mro,
210
+ ucp_Nabataean,
211
+ ucp_Old_North_Arabian,
212
+ ucp_Old_Permic,
213
+ ucp_Pahawh_Hmong,
214
+ ucp_Palmyrene,
215
+ ucp_Psalter_Pahlavi,
216
+ ucp_Pau_Cin_Hau,
217
+ ucp_Siddham,
218
+ ucp_Tirhuta,
219
+ ucp_Warang_Citi
220
+ };
221
+
222
+ #endif
223
+
224
+ /* End of ucp.h */
@@ -1,5 +1,6 @@
1
- DISABLE_WARNINGS(implicit-fallthrough)
2
- ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
3
- FILE(GLOB SRC_ZLIB "*.c" "*.h")
4
- INCLUDE_DIRECTORIES(".")
5
- ADD_LIBRARY(zlib OBJECT ${SRC_ZLIB})
1
+ disable_warnings(implicit-fallthrough)
2
+ add_definitions(-DNO_VIZ -DSTDC -DNO_GZIP)
3
+ file(GLOB SRC_ZLIB "*.c" "*.h")
4
+ list(SORT SRC_ZLIB)
5
+ include_directories(".")
6
+ add_library(zlib OBJECT ${SRC_ZLIB})
@@ -177,10 +177,3 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2)
177
177
  return adler32_combine_(adler1, adler2, len2);
178
178
  }
179
179
 
180
- uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
181
- uLong adler1;
182
- uLong adler2;
183
- z_off64_t len2;
184
- {
185
- return adler32_combine_(adler1, adler2, len2);
186
- }
@@ -433,10 +433,3 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
433
433
  return crc32_combine_(crc1, crc2, len2);
434
434
  }
435
435
 
436
- uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
437
- uLong crc1;
438
- uLong crc2;
439
- z_off64_t len2;
440
- {
441
- return crc32_combine_(crc1, crc2, len2);
442
- }
@@ -320,6 +320,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
320
320
 
321
321
  s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
322
322
  s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
323
+ memset(s->prev, 0, s->w_size * sizeof(Pos));
323
324
  s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
324
325
 
325
326
  s->high_water = 0; /* nothing written to s->window yet */
@@ -15,12 +15,14 @@
15
15
  #include "git2/blame.h"
16
16
  #include "git2/branch.h"
17
17
  #include "git2/buffer.h"
18
+ #include "git2/cert.h"
18
19
  #include "git2/checkout.h"
19
20
  #include "git2/cherrypick.h"
20
21
  #include "git2/clone.h"
21
22
  #include "git2/commit.h"
22
23
  #include "git2/common.h"
23
24
  #include "git2/config.h"
25
+ #include "git2/credential.h"
24
26
  #include "git2/deprecated.h"
25
27
  #include "git2/describe.h"
26
28
  #include "git2/diff.h"
@@ -78,7 +78,7 @@ GIT_EXTERN(int) git_annotated_commit_lookup(
78
78
  const git_oid *id);
79
79
 
80
80
  /**
81
- * Creates a `git_annotated_comit` from a revision string.
81
+ * Creates a `git_annotated_commit` from a revision string.
82
82
  *
83
83
  * See `man gitrevisions`, or
84
84
  * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for
@@ -53,25 +53,44 @@ typedef int GIT_CALLBACK(git_apply_hunk_cb)(
53
53
  const git_diff_hunk *hunk,
54
54
  void *payload);
55
55
 
56
+ /** Flags controlling the behavior of git_apply */
57
+ typedef enum {
58
+ /**
59
+ * Don't actually make changes, just test that the patch applies.
60
+ * This is the equivalent of `git apply --check`.
61
+ */
62
+ GIT_APPLY_CHECK = (1 << 0),
63
+ } git_apply_flags_t;
64
+
56
65
  /**
57
66
  * Apply options structure
58
67
  *
59
68
  * Initialize with `GIT_APPLY_OPTIONS_INIT`. Alternatively, you can
60
- * use `git_apply_init_options`.
69
+ * use `git_apply_options_init`.
61
70
  *
62
71
  * @see git_apply_to_tree, git_apply
63
72
  */
64
73
  typedef struct {
65
- unsigned int version;
74
+ unsigned int version; /**< The version */
66
75
 
76
+ /** When applying a patch, callback that will be made per delta (file). */
67
77
  git_apply_delta_cb delta_cb;
78
+
79
+ /** When applying a patch, callback that will be made per hunk. */
68
80
  git_apply_hunk_cb hunk_cb;
81
+
82
+ /** Payload passed to both delta_cb & hunk_cb. */
69
83
  void *payload;
84
+
85
+ /** Bitmask of git_apply_flags_t */
86
+ unsigned int flags;
70
87
  } git_apply_options;
71
88
 
72
89
  #define GIT_APPLY_OPTIONS_VERSION 1
73
90
  #define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
74
91
 
92
+ GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int version);
93
+
75
94
  /**
76
95
  * Apply a `git_diff` to a `git_tree`, and return the resulting image
77
96
  * as an index.
@@ -81,6 +100,7 @@ typedef struct {
81
100
  * @param preimage the tree to apply the diff to
82
101
  * @param diff the diff to apply
83
102
  * @param options the options for the apply (or null for defaults)
103
+ * @return 0 or an error code
84
104
  */
85
105
  GIT_EXTERN(int) git_apply_to_tree(
86
106
  git_index **out,
@@ -89,6 +109,7 @@ GIT_EXTERN(int) git_apply_to_tree(
89
109
  git_diff *diff,
90
110
  const git_apply_options *options);
91
111
 
112
+ /** Possible application locations for git_apply */
92
113
  typedef enum {
93
114
  /**
94
115
  * Apply the patch to the workdir, leaving the index untouched.
@@ -117,6 +138,7 @@ typedef enum {
117
138
  * @param diff the diff to apply
118
139
  * @param location the location to apply (workdir, index or both)
119
140
  * @param options the options for the apply (or null for defaults)
141
+ * @return 0 or an error code
120
142
  */
121
143
  GIT_EXTERN(int) git_apply(
122
144
  git_repository *repo,
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
30
30
  * Then for file `xyz.c` looking up attribute "foo" gives a value for
31
31
  * which `GIT_ATTR_TRUE(value)` is true.
32
32
  */
33
- #define GIT_ATTR_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_TRUE_T)
33
+ #define GIT_ATTR_IS_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_TRUE)
34
34
 
35
35
  /**
36
36
  * GIT_ATTR_FALSE checks if an attribute is set off. In core git
@@ -44,7 +44,7 @@ GIT_BEGIN_DECL
44
44
  * Then for file `zyx.h` looking up attribute "foo" gives a value for
45
45
  * which `GIT_ATTR_FALSE(value)` is true.
46
46
  */
47
- #define GIT_ATTR_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T)
47
+ #define GIT_ATTR_IS_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_FALSE)
48
48
 
49
49
  /**
50
50
  * GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified. This
@@ -62,7 +62,7 @@ GIT_BEGIN_DECL
62
62
  * file `onefile.rb` or looking up "bar" on any file will all give
63
63
  * `GIT_ATTR_UNSPECIFIED(value)` of true.
64
64
  */
65
- #define GIT_ATTR_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T)
65
+ #define GIT_ATTR_IS_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_UNSPECIFIED)
66
66
 
67
67
  /**
68
68
  * GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
@@ -74,17 +74,17 @@ GIT_BEGIN_DECL
74
74
  * Given this, looking up "eol" for `onefile.txt` will give back the
75
75
  * string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
76
76
  */
77
- #define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_T)
77
+ #define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_STRING)
78
78
 
79
79
  /**
80
80
  * Possible states for an attribute
81
81
  */
82
82
  typedef enum {
83
- GIT_ATTR_UNSPECIFIED_T = 0, /**< The attribute has been left unspecified */
84
- GIT_ATTR_TRUE_T, /**< The attribute has been set */
85
- GIT_ATTR_FALSE_T, /**< The attribute has been unset */
86
- GIT_ATTR_VALUE_T, /**< This attribute has a value */
87
- } git_attr_t;
83
+ GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
84
+ GIT_ATTR_VALUE_TRUE, /**< The attribute has been set */
85
+ GIT_ATTR_VALUE_FALSE, /**< The attribute has been unset */
86
+ GIT_ATTR_VALUE_STRING, /**< This attribute has a value */
87
+ } git_attr_value_t;
88
88
 
89
89
  /**
90
90
  * Return the value type for a given attribute.
@@ -99,7 +99,7 @@ typedef enum {
99
99
  * @param attr The attribute
100
100
  * @return the value type for the attribute
101
101
  */
102
- GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
102
+ GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);
103
103
 
104
104
  /**
105
105
  * Check attribute flags: Reading values from index and working directory.
@@ -119,13 +119,20 @@ GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
119
119
  #define GIT_ATTR_CHECK_INDEX_ONLY 2
120
120
 
121
121
  /**
122
- * Check attribute flags: Using the system attributes file.
122
+ * Check attribute flags: controlling extended attribute behavior.
123
123
  *
124
124
  * Normally, attribute checks include looking in the /etc (or system
125
125
  * equivalent) directory for a `gitattributes` file. Passing this
126
126
  * flag will cause attribute checks to ignore that file.
127
+ * equivalent) directory for a `gitattributes` file. Passing the
128
+ * `GIT_ATTR_CHECK_NO_SYSTEM` flag will cause attribute checks to
129
+ * ignore that file.
130
+ *
131
+ * Passing the `GIT_ATTR_CHECK_INCLUDE_HEAD` flag will use attributes
132
+ * from a `.gitattributes` file in the repository at the HEAD revision.
127
133
  */
128
- #define GIT_ATTR_CHECK_NO_SYSTEM (1 << 2)
134
+ #define GIT_ATTR_CHECK_NO_SYSTEM (1 << 2)
135
+ #define GIT_ATTR_CHECK_INCLUDE_HEAD (1 << 3)
129
136
 
130
137
  /**
131
138
  * Look up the value of one git attribute for path.
@@ -231,8 +238,11 @@ GIT_EXTERN(int) git_attr_foreach(
231
238
  * disk no longer match the cached contents of memory. This will cause
232
239
  * the attributes files to be reloaded the next time that an attribute
233
240
  * access function is called.
241
+ *
242
+ * @param repo The repository containing the gitattributes cache
243
+ * @return 0 on success, or an error code
234
244
  */
235
- GIT_EXTERN(void) git_attr_cache_flush(
245
+ GIT_EXTERN(int) git_attr_cache_flush(
236
246
  git_repository *repo);
237
247
 
238
248
  /**