Commit Graph

975 Commits

Author SHA1 Message Date
lhchavez e9856f2c38 Clean up one leaked temporary directory
A `defer cleanupTestRepo()` was missing.
2019-01-05 22:41:35 +00:00
lhchavez f3c487966d Improve the static build script
This change:

* Uses the installed version of both the library and the pkgconfig file,
  which fixes path resolution on Ubuntu Xenial.
* Uses quoting liberally so that paths with spaces in them are correctly
  handled.
* Moves the build+install directories to static-build/ in the git2go
  repository to avoid having a dirty vendor/libgit2 checkout.
2019-01-05 20:28:35 +00:00
Carlos Martín Nieto 7ae106611c
Merge pull request #420 from josharian/rebase-operation-type-stringer
Add RebaseOperationReword, and make RebaseOperationType a stringer
2019-01-05 11:05:44 +00:00
Carlos Martín Nieto fb438dbf9a
Merge pull request #474 from libgit2/cmn/deprecated-names
Use git_object_t instead of deprecated git_otype
2019-01-05 11:04:03 +00:00
Carlos Martín Nieto ee6dff2f8e Use git_object_t instead of deprecated git_otype 2019-01-05 10:48:42 +00:00
Carlos Martín Nieto b06a2a6900
Merge pull request #471 from libgit2/cmn/bump-libgit2
Bump vendored libgit2 to fba70a9d5f
2019-01-04 13:35:12 +00:00
Carlos Martín Nieto f969cc900d Bump vendored libgit2 to fba70a9d5f
This includes updating the `Index.WriteTreeTo` test as it was abusing an
oversight of the object creation safety checks and creating a tree referencing
a non-existent blob. Instead we update it to the primary purpose of this method
which is to write into a repository from an unattached index.
2019-01-04 13:18:54 +00:00
Carlos Martín Nieto bcf325244c
Merge pull request #445 from rmg/exclusive-pkg-config
static: use pkg-config exclusively when using it
2019-01-04 12:18:20 +00:00
Carlos Martín Nieto b51a90c133
Merge pull request #465 from lhchavez/packbuilder-insert_from_walk
Add support for Packbuilder.InsertFromWalk()
2019-01-04 12:11:05 +00:00
Carlos Martín Nieto c27981c283
Merge pull request #463 from Nivl/patch-1
Add index.Clear() to clear the index object
2019-01-04 00:43:48 +00:00
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
lhchavez 8d27336e8a Add support for Packbuilder.InsertFromWalk()
This change adds support for Packbuilder.InsertFromWalk() from libgit2.
2018-11-15 03:20:51 +00:00
lhchavez 8ff5e43711 Add support for CreateCommitFromIds
This change adds support for CreateCommitFromIds from libgit2.
2018-11-15 03:19:28 +00:00
Melvin dd973b99ad
Add index.Clear() to clear the index object 2018-10-25 15:52:43 -07: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
Ryan Graham b3256d9058
static: use pkg-config exclusively when using it
When using the static linking option on platforms that use pkg-config,
use ONLY pkg-config to get the CFLAGS and LDFLAGS. This prevents pulling
in dependencies and flags for any non-vendored version that may be
present on the host.

The main practical effect of this is that if someone doesn't need/want
any sort of remote access support at all they can completely disable
libcurl, libssh2, libssl, etc and produce a smaller/simpler binary and
greatly simplify their build-time dependencies. When done properly, the
generated pkg-config file will tell cgo everything it needs to know.

This also prevents confusion if there is a system copy of libgit2 that
is being given priority over the vendored build.

Signed-off-by: Ryan Graham <r.m.graham@gmail.com>
2018-08-23 10:45:27 -07: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
lhchavez d7fd15b1e0 Add support for mempack
This allows the creation of git packfiles without needing to write them
to the filesystem.
2018-07-07 23:17:24 +00: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