Commit Graph

851 Commits

Author SHA1 Message Date
Richard Burke b55ee91e3c Add revert functionality
Closes #436

(cherry picked from commit 30c3d0ffe2)
2020-08-16 07:19:20 -07:00
lhchavez 2fba250690 Free() the copies of repository.LookupXxx()
`repository.LookupXxx()` allocate new go `Object`s that have a reference
to a `C.git_object`. Those are then duplicated with `git_object_dup()`,
so the original `Object`s linger unnecessarily until the Go GC kicks in.

This change explicitly calls `Free()` on the originals to avoid
unnecessary accumulation of garbage.

(cherry picked from commit 2bb5930733)
2020-08-16 07:19:20 -07:00
lhchavez d47253fb80 Update CI configuration
This change:

* Updates the GitHub actions so that they run different commands for the
  dynamic and static flavors of libgit2.
* Updates the .travis.yml file so that it does roughly the same as the
  GitHub actions.
* Adds the release-* branches to the CI configurations.

(cherry picked from commit 26edffd5f5)
2020-08-16 07:19:20 -07:00
lhchavez 9f2bfe5f32 Merge pull request #520 from libgit2/actions
Setup CI via Actions

(cherry picked from commit f21ecd9e74)
2020-08-16 07:19:20 -07:00
lhchavez 75b56d820b Merge pull request #527 from dbolkensteyn/master
Fixes #513 - Segfault during tree walk

(cherry picked from commit 75c5e41422)
2020-08-16 07:19:20 -07:00
lhchavez 61d996a04e Merge pull request #523 from josharian/diff-stringers
make Delta and DiffLineType stringers

(cherry picked from commit 11506ab070)
2020-08-16 07:19:20 -07:00
lhchavez cba876ecd1 Merge pull request #524 from josharian/doc-params
provide param names in DiffForEachFileCallback

(cherry picked from commit 917d8dcb9e)
2020-08-16 07:19:20 -07:00
lhchavez f3992bae37 Merge pull request #503 from jonEbird/static-build-script-cleanup
script/build-libgit2-static.sh: correctly set ROOT

(cherry picked from commit aa802a90db)
2020-08-16 07:19:20 -07:00
Carlos Martín Nieto e7a003dacc Merge pull request #506 from takuji/git_commit_message_encoding
Add git_commit_message_encoding support

(cherry picked from commit b2e2b2f71b)
2020-08-16 07:19:20 -07:00
Carlos Martín Nieto 19ac948456 Merge pull request #512 from codeocean/diff-to-buf
Add Diff.ToBuf wrapping git_diff_to_buf

(cherry picked from commit 4fa9349942)
2020-08-16 07:19:20 -07:00
lhchavez 7694d5f5fc Add the /v28 suffix to go.mod
This is compliant with
https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher,
which says

```
Major branch: Update the go.mod file to include a /v3 at the end of the
module path in the module directive (e.g., module
github.com/my/module/v3). Update import statements within the module to
also use /v3 (e.g., import "github.com/my/module/v3/mypkg"). Tag the
release with v3.0.0.
```

This also means that unfortunately we cannot keep using libgit2's exact
version number (plus a build number for git2go purposes, since go only
recognizes vMAJOR.MINOR.PATCH format).

(Tentatively) fixes: #536
2020-02-18 19:50:49 -08:00
lhchavez 437c7c3344
Merge pull request #531 from suhaibmujahid/patch-1
Switch over the version constraints to v0.28
2020-02-16 06:44:16 -08:00
Suhaib Mujahid 70058bd989
Switch over the version constraints to v0.28 2020-01-17 22:09:18 -05:00
Carlos Martín Nieto b1eec9a466
Merge pull request #530 from libgit2/cmn/bump-libgit2-28
Update libgit2 to v0.28.4
2019-12-10 23:15:50 +01:00
Carlos Martín Nieto a478c6d7ef Update libgit2 to v0.28.4 2019-12-10 21:47:55 +00:00
Carlos Martín Nieto bf1e8a4338
Merge pull request #479 from lhchavez/uprev-libgit2
Uprev vendored libgit2 to v.0.28
2019-02-15 14:26:37 +01:00
lhchavez 5fda6dd901 Uprev vendored libgit2 to v0.28
New version is here!
2019-02-11 03:57:50 +00:00
Carlos Martín Nieto 2f91268f74
Merge pull request #448 from lhchavez/mempack
Add support for mempack
2019-01-15 20:46:54 +01:00
Carlos Martín Nieto f4ea2a561d Keep odb alive when adding mempack 2019-01-15 20:28:36 +01:00
Carlos Martín Nieto 8766f9f36c
Merge pull request #466 from lhchavez/repository-create_commit_from_ids
Add support for CreateCommitFromIds
2019-01-08 09:30:36 +00:00
lhchavez 6d67bde74a Merge remote-tracking branch 'upstream/master' into repository-create_commit_from_ids 2019-01-08 02:51:21 +00:00
lhchavez 35518c78df Keeping the tree alive 2019-01-08 02:50:42 +00:00
lhchavez f505e39c9e Add a test and some comments as to the ugly pointer arithmetic 2019-01-08 02:50:25 +00:00
lhchavez a2c93a0bcf Addressed review feedback and added a test 2019-01-08 02:45:04 +00:00
lhchavez b609c04b68 Merge remote-tracking branch 'upstream/master' into mempack 2019-01-08 02:01:44 +00:00
Carlos Martín Nieto 2609f4c6f2
Merge pull request #477 from lhchavez/patch-1
Add support for Go 1.11 modules
2019-01-07 16:00:59 +00:00
Carlos Martín Nieto b30b050c9c
Merge pull request #475 from lhchavez/self-contained-build
Improve the static build script
2019-01-07 14:02:51 +00:00
Carlos Martín Nieto e93f34cf18
Merge pull request #476 from lhchavez/clean-up-leaked-dir
Clean up one leaked temporary directory
2019-01-07 12:33:43 +00:00
lhchavez 30c57ff09e
Add support for Go 1.11 modules
This change adds a `go.mod` file. An empty file is sufficient since this
project has no external dependencies. For people that want to use the static
version of libgit2, this module can be vendored and the following can be added
to their `go.mod` file:

    replace github.com/libgit2/git2go => ./vendor/github.com/libgit2/git2go
2019-01-06 07:34:50 -08:00
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