Commit Graph

805 Commits

Author SHA1 Message Date
Carlos Martín Nieto c740e1d83d
Merge pull request #432 from josharian/simplify-oid
git: simplify some Oid methods
2019-01-03 23:53:13 +00:00
Carlos Martín Nieto fc1230ba16
Merge pull request #447 from walkenzoy/master
git2go: small fixes to odb module
2019-01-03 16:22:15 +01:00
Carlos Martín Nieto e319b9427f
Merge pull request #425 from josharian/more-merge-file-flags
merge: add missing MergeFileFlag constants
2019-01-02 23:58:19 +01:00
Carlos Martín Nieto 7197faee79
Merge pull request #424 from josharian/sigdoc
signature: improve Signature.Offset docs
2019-01-02 23:13:50 +01:00
Carlos Martín Nieto 7e9128bd58
Merge pull request #470 from lhchavez/fix-odbreadstream-read
Return io.EOF on OdbReadStream.Read()
2019-01-02 23:03:07 +01:00
Carlos Martín Nieto 69175cb426
Merge pull request #469 from praveentiru/pty/issue#256
Remove unused parameter in OpenOndisk #256
2019-01-02 22:33:10 +01:00
lhchavez ab3470030b Add some tests
This should prevent regressions in the future.
2018-12-28 04:42:09 +00:00
lhchavez 344dc33fae Return io.EOF on OdbReadStream.Read()
This change makes OdbReadStream.Read() comply with the usual io.Reader
semantics.
2018-12-28 04:35:20 +00:00
praveen e0ad45065e Fixed issues with tests 2018-12-25 08:44:01 +05:30
praveen 92ebf4515c Remove unused parameter in OpenOndisk 2018-12-25 08:27:32 +05:30
Carlos Martín Nieto 8b368063e9
Merge pull request #468 from wmedlar/patch-1
Fix typo in constant name
2018-12-17 10:52:34 +00:00
Will Medlar a2ac1b9ed1
Fix typo in constant name 2018-12-17 01:56:37 -06:00
Carlos Martín Nieto eec1547c20
Merge pull request #460 from libgit2/cmn/bump-master
Update vendored libgit2 to 838a2f291
2018-10-07 19:03:38 +02:00
Carlos Martín Nieto 92501bd663 Update vendored libgit2 to 838a2f291 2018-10-07 18:50:25 +02:00
Carlos Martín Nieto 5280ceb751
Merge pull request #452 from libgit2/cmn/bump-libgit2-master
Bump vendored libgit2 to 275d84c583
2018-08-08 12:33:28 +02:00
Carlos Martín Nieto 538a05d55c Remove uses of deprecated git_buf_free 2018-08-08 11:51:51 +02:00
Carlos Martín Nieto 973938cbb5 Bump vendored libgit2 to 9275d84c583 2018-08-08 11:45:48 +02:00
Michel Lespinasse bdca40d275 git2go: small fixes to odb module
- Fix couple cgo issues in odb.Write() and odb.Hash(). This is the
  same issue - and same solution - as repo.CreateBlobFromBuffer()
  used to have.

- Add test for odb.Read()
2018-07-03 16:43:07 -07:00
Carlos Martín Nieto 14280de4da
Merge pull request #443 from walkenzoy/master
git2go: fix reference iterator leak
2018-05-31 07:26:17 +02:00
Michel Lespinasse a2de5ababa git2go: fix reference iterator leak
This fixes a leak that was apparently introduced in commit 55a1096141.
2018-05-30 14:15:59 -07:00
Carlos Martín Nieto 2c42b80551
Merge pull request #442 from libgit2/cmn/bump-libgit2
vendor: bump libgit2 to 7f6c1ce9760c6
2018-05-29 21:30:38 +02:00
Carlos Martín Nieto 925932a54f vendor: bump libgit2 to 7f6c1ce9760c6 2018-05-29 21:09:45 +02:00
Carlos Martín Nieto 1381380f34 travis: let yaml know these strings are strings 2018-03-26 12:58:53 +02:00
Carlos Martín Nieto b479bd1463
Merge pull request #438 from libgit2/cmn/bump-27
vendor: update libgit2 to v0.27.0
2018-03-26 12:50:50 +02:00
Carlos Martín Nieto bcb303ad17 travis: build against Go 1.10 2018-03-26 12:35:03 +02:00
Carlos Martín Nieto 304d67b0fb vendor: update libgit2 to v0.27.0 2018-03-26 12:31:09 +02:00
Carlos Martín Nieto ec48b0a307
Merge pull request #430 from sprohaska/pr/keep-alive
tree: keep tree receiver alive as long as dependent entry is used
2018-03-11 14:26:00 +01:00
Carlos Martín Nieto 127b998807
Merge pull request #431 from josharian/refdocs
reference: minor doc improvements
2018-03-11 14:21:25 +01:00
Carlos Martín Nieto e57025a372
Merge pull request #434 from libgit2/cmn/bumping
Update vendored libgit2 to v0.27.0-rc1
2018-02-22 10:06:47 +01:00
Carlos Martín Nieto 661e1a6f1b merge: expose the conflict marker size option 2018-02-22 09:46:42 +01:00
Carlos Martín Nieto cff71166ec Adjust to the change in the git_odb_open_rstream signature 2018-02-22 09:28:58 +01:00
Carlos Martín Nieto b52e13f37d Switch over the version contraints to v0.27 2018-02-22 09:28:49 +01:00
Carlos Martín Nieto ec429ccdfc vendor: bump libgit2 to 809b0ca6b (v0.27.0-rc1) 2018-02-22 09:07:57 +01:00
Josh Bleecher Snyder b7ca4a96f5 git: simplify some Oid methods 2018-02-15 10:01:40 -08:00
Josh Bleecher Snyder 589ec2bc28 reference: minor doc improvements 2018-02-15 09:39:26 -08:00
Steffen Prohaska fcb86e6f8e
tree: keep tree receiver alive as long as dependent entry is used
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2018-02-09 11:17:10 +01:00
Josh Bleecher Snyder 9de57cc90e merge: add missing MergeFileFlag constants
While we're here, pull in comments as well.
While one can pop back and forth between godoc and libgit2 refs,
it's much nicer to have it in one place.

Note that MergeFileStyleSimplifyAlnum probably should have been called
merely MergeFileSimplifyAlnum (no "Style"). It's probably not worth
breaking backwards compatibility to fix it, but we avoid the mistake
going forwards.
2018-01-25 16:55:42 -08:00
Josh Bleecher Snyder cf2379295a signature: improve Signature.Offset docs
Use standard godoc style; be more precise.
2018-01-25 15:59:00 -08:00
Carlos Martín Nieto 432a164805
Merge pull request #419 from libgit2/cmn/bump-libgit2
Cmn/bump libgit2
2018-01-17 12:18:08 +00:00
Carlos Martín Nieto a38a8e8ede diff: add two missing options 2018-01-17 11:47:06 +00:00
Carlos Martín Nieto ec5d2bee0f Bump libgit2 to f1323d9c 2018-01-17 11:43:25 +00:00
Carlos Martín Nieto f439cc93e9 Merge pull request #413 from libgit2/cmn/master-static
README: master wants to use install-static
2017-10-16 15:42:45 +02:00
Carlos Martín Nieto cd779176d1 README: correct the branches in the testing block 2017-10-16 15:36:57 +02:00
Carlos Martín Nieto 72510e9d3a README: master wants to use install-static 2017-10-16 15:14:26 +02:00
Carlos Martín Nieto dc745f54c5 Merge pull request #411 from harsimranmaan/patch-1
Fix typo in the error message
2017-10-03 11:30:33 +02:00
Harsimran Singh Maan 3452fe984d Fix typo in the error message 2017-10-01 21:04:08 -07:00
Carlos Martín Nieto b011f6b248 Merge pull request #409 from libgit2/cmn/bumping
Bump libgit2 to c7c5f2c4ec
2017-09-29 09:56:41 +02:00
Carlos Martín Nieto a69a0b1919 patch: adjust to new function signature 2017-09-29 09:49:21 +02:00
Carlos Martín Nieto 028ea07d77 Bump libgit2 to c7c5f2c4ec 2017-09-29 09:41:46 +02:00
Carlos Martín Nieto a2e6f1db85 Merge pull request #398 from reujab/master
Fixed typos
2017-09-03 20:12:52 +02:00