Commit Graph

858 Commits

Author SHA1 Message Date
Carlos Martín Nieto a13d27e9c0 Merge pull request #475 from lhchavez/self-contained-build
Improve the static build script

(cherry picked from commit b30b050c9c)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto fedb5b8e68 Merge pull request #476 from lhchavez/clean-up-leaked-dir
Clean up one leaked temporary directory

(cherry picked from commit e93f34cf18)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto 7b1c424572 Merge pull request #420 from josharian/rebase-operation-type-stringer
Add RebaseOperationReword, and make RebaseOperationType a stringer

(cherry picked from commit 7ae106611c)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto a07879739f Merge pull request #445 from rmg/exclusive-pkg-config
static: use pkg-config exclusively when using it
(cherry picked from commit bcf325244c)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto d314b459b8 Merge pull request #465 from lhchavez/packbuilder-insert_from_walk
Add support for Packbuilder.InsertFromWalk()

(cherry picked from commit b51a90c133)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto eb38aaaeee Merge pull request #463 from Nivl/patch-1
Add index.Clear() to clear the index object

(cherry picked from commit c27981c283)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto 97d05a1e4c Merge pull request #432 from josharian/simplify-oid
git: simplify some Oid methods
(cherry picked from commit c740e1d83d)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto 13d16e7ac5 Merge pull request #447 from walkenzoy/master
git2go: small fixes to odb module
(cherry picked from commit fc1230ba16)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto 10ce505588 Merge pull request #425 from josharian/more-merge-file-flags
merge: add missing MergeFileFlag constants
(cherry picked from commit e319b9427f)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto da10fee49e Merge pull request #424 from josharian/sigdoc
signature: improve Signature.Offset docs
(cherry picked from commit 7197faee79)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto c74ce46055 Merge pull request #470 from lhchavez/fix-odbreadstream-read
Return io.EOF on OdbReadStream.Read()

(cherry picked from commit 7e9128bd58)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto 13d27a4f62 Merge pull request #468 from wmedlar/patch-1
Fix typo in constant name

(cherry picked from commit 8b368063e9)
2020-08-16 07:19:09 -07:00
Carlos Martín Nieto ca9f5b6523 Merge pull request #443 from walkenzoy/master
git2go: fix reference iterator leak
(cherry picked from commit 14280de4da)
2020-08-16 07:19:09 -07:00
lhchavez 6cc7d3dc6a
Merge pull request #526 from dbolkensteyn/v27
Fixes #513 - Segfault during tree walk
2020-02-16 07:31:32 -08:00
Carlos Martín Nieto 6ee3a5f589
Merge pull request #529 from libgit2/cmn/bump-libgit2-27
Update libgit2 to v0.27.10
2019-12-10 22:41:57 +01:00
Carlos Martín Nieto f0ad5b44b9 Update libgit2 to v0.27.10 2019-12-10 21:36:08 +00:00
Dinesh Bolkensteyn 53ee1f6e9a Similar to #513 Fix potential segfault on Tag objects 2019-11-17 17:41:56 +01:00
Dinesh Bolkensteyn 75a20e5aeb Fixes #513 - Segfault during tree walk 2019-11-17 09:19:36 +01:00
Carlos Martín Nieto 94786f9c8f
Merge pull request #518 from libgit2/cmn/update-27
Update vendored libgit2 to v0.27.9
2019-08-13 19:36:01 +02:00
Carlos Martín Nieto 43550d0b7f Update vendored libgit2 to v0.27.9 2019-08-13 19:24:57 +02:00
Carlos Martín Nieto ecaeb7a21d
Merge pull request #472 from libgit2/cmn/bump-v27
Update vendored libgit2 to v0.27.7
2019-01-04 13:40:18 +00:00
Carlos Martín Nieto e209475ae0 Update vendored libgit2 to v0.27.7 2019-01-04 13:25:56 +00:00
Carlos Martín Nieto 290d16a225
Merge pull request #459 from libgit2/cmn/bump-v27
Update vendored libgit2 to v0.27.5
2018-10-07 18:59:15 +02:00
Carlos Martín Nieto bde7731d51 Update vendored libgit2 to v0.27.5 2018-10-07 18:48:41 +02:00
Carlos Martín Nieto c0c29489d9
Merge pull request #450 from libgit2/cmn/bump-libgit2
Bump vendored libgit2 to v0.27.4
2018-08-08 11:35:01 +02:00
Carlos Martín Nieto 7696f18fed Bump vendored libgit2 to v0.27.4 2018-08-08 11:04:32 +02:00
Carlos Martín Nieto 9abc0506da
Merge pull request #441 from libgit2/cmn/update-v27-1
vendor: update libgit2 to v0.27.1
2018-05-29 20:57:54 +02:00
Carlos Martín Nieto ef79809066 vendor: update libgit2 to v0.27.1 2018-05-29 20:21:28 +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 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
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