<feed xmlns='http://www.w3.org/2005/Atom'>
<title>jcarr/libgit2/merge.go, branch v0.1.5</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<id>http://cgit.wit.com/jcarr/libgit2/atom?h=v0.1.5</id>
<link rel='self' href='http://cgit.wit.com/jcarr/libgit2/atom?h=v0.1.5'/>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/'/>
<updated>2021-09-06T01:52:01Z</updated>
<entry>
<title>Make all Options objects consistent</title>
<updated>2021-09-06T01:52:01Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-12-05T03:54:26Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=b78bde3d74b1617d5b635723552aaec0583eb054'/>
<id>urn:sha1:b78bde3d74b1617d5b635723552aaec0583eb054</id>
<content type='text'>
This change makes all Options objects have child Option fields as values
(instead of pointers) to mirror the libgit2 interface. It also names
them Options instead of Opts to match the current libgit2 nomenclature
and removes the Version fields.
</content>
</entry>
<entry>
<title>Make all non-user-creatable structures non-comparable (#802)</title>
<updated>2021-09-05T20:59:36Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2021-09-05T20:59:36Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=dbe032c347b1a1308a4b880e7c5a06d8dfb4d507'/>
<id>urn:sha1:dbe032c347b1a1308a4b880e7c5a06d8dfb4d507</id>
<content type='text'>
This change makes all non-user-creatable structures non-comparable. This
makes it easier to add changes later that don't introduce breaking
changes from the go compatibility guarantees perspective.

This, of course, implies that this change _is_ a breaking change, but since
these structures are not intended to be created by users (or de-referenced),
it should be okay.</content>
</entry>
<entry>
<title>Support more MergeBase functions (#720)</title>
<updated>2020-12-13T18:35:34Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-12-13T18:35:34Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=698ddfb4ac4d8d7d66f68e36ceabcabc5426002b'/>
<id>urn:sha1:698ddfb4ac4d8d7d66f68e36ceabcabc5426002b</id>
<content type='text'>
This change adds support for MergeBaseMany, MergeBasesMany, and
MergeBaseOctopus.</content>
</entry>
<entry>
<title>More callback refactoring (#713)</title>
<updated>2020-12-10T15:19:41Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-12-10T15:19:41Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=10c67474a89c298172a6703b91980ea37c60d5e5'/>
<id>urn:sha1:10c67474a89c298172a6703b91980ea37c60d5e5</id>
<content type='text'>
This change:

* Gets rid of the `.toC()` functions for Options objects, since they
  were redundant with the `populateXxxOptions()`.
* Adds support for `errorTarget` to the `RemoteOptions`, since they are
  used in the same stack for some functions (like `Fetch()`). Now for
  those cases, the error returned by the callback will be preserved
  as-is.</content>
</entry>
<entry>
<title>Refactor all callbacks (#700)</title>
<updated>2020-12-05T21:13:59Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-12-05T21:13:59Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=5d8eaf7e65c404a0d10d3705697dd99369630dda'/>
<id>urn:sha1:5d8eaf7e65c404a0d10d3705697dd99369630dda</id>
<content type='text'>
This change is a preparation for another change that makes all callback
types return a Go error instead of an error code / an integer. That is
going to make make things a lot more idiomatic.

The reason this change is split is threefold:

a) This change is mostly mechanical and should contain no semantic
   changes.
b) This change is backwards-compatible (in the Go API compatibility
   sense of the word), and thus can be backported to all other releases.
c) It makes the other change a bit smaller and more focused on just one
   thing.

Concretely, this change makes all callbacks populate a Go error when
they fail. If the callback is invoked from the same stack as the
function to which it was passed (e.g. for `Tree.Walk`), it will preserve
the error object directly into a struct that also holds the callback
function. Otherwise if the callback is pased to one func and will be
invoked when run from another one (e.g. for `Repository.InitRebase`),
the error string is saved into the libgit2 thread-local storage and then
re-created as a `GitError`.</content>
</entry>
<entry>
<title>Mark some symbols to be deprecated #minor (#698)</title>
<updated>2020-12-05T15:23:44Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-12-05T15:23:44Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=137c05e802d5e11a5ab54809bc8be8f61ccece21'/>
<id>urn:sha1:137c05e802d5e11a5ab54809bc8be8f61ccece21</id>
<content type='text'>
This change introduces the file deprecated.go, which contains any
constants, functions, and types that are slated to be deprecated in the
next major release.

These symbols are deprecated because they refer to old spellings in
pre-1.0 libgit2. This also makes the build be done with the
`-DDEPRECATE_HARD` flag to avoid regressions.

This, together with
[gorelease](https://godoc.org/golang.org/x/exp/cmd/gorelease)[1] should
make releases safer going forward.

1: More information about how that works at
   https://go.googlesource.com/exp/+/refs/heads/master/apidiff/README.md</content>
</entry>
<entry>
<title>refactor: Use undeprecated options init (#656)</title>
<updated>2020-10-22T13:18:11Z</updated>
<author>
<name>Suhaib Mujahid</name>
<email>suhaibmujahid@gmail.com</email>
</author>
<published>2020-10-22T13:18:11Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=5b6ce70b8997254ce48f8c24ba4198080e646fdd'/>
<id>urn:sha1:5b6ce70b8997254ce48f8c24ba4198080e646fdd</id>
<content type='text'>
This PR move form linking against the deprecated `init_options` functions to the renamed `options_init` functions.

For more context see libgit2/libgit2@0b5ba0d744e69da5dc8c08d167c83dd87ed83af2 and libgit2/libgit2@c6184f0c4b209e462bf3f42ab20df2d13d8ee918.</content>
</entry>
<entry>
<title>merge: Expose recursion limit merge option (#642)</title>
<updated>2020-09-18T12:43:56Z</updated>
<author>
<name>Patrick Steinhardt</name>
<email>ps@pks.im</email>
</author>
<published>2020-09-18T12:43:56Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=7e726fda6ec2b5d773e5a8b54ed06378a53c0f7f'/>
<id>urn:sha1:7e726fda6ec2b5d773e5a8b54ed06378a53c0f7f</id>
<content type='text'>
The `recursion_limit` merge option provided by libgit2 is currently not
exposed and thus inaccessible to Git2Go users. Let's expose it to let
users control creation of recursive merge bases.</content>
</entry>
<entry>
<title>Provide missing merge flags (#615)</title>
<updated>2020-06-05T03:34:37Z</updated>
<author>
<name>Takuji Shimokawa</name>
<email>takuji.shimokawa@gmail.com</email>
</author>
<published>2020-06-05T03:34:37Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=33dac3d46077ef71ed97ba232a0a53b793f1ca7e'/>
<id>urn:sha1:33dac3d46077ef71ed97ba232a0a53b793f1ca7e</id>
<content type='text'>
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.</content>
</entry>
<entry>
<title>Add test and runtime.KeepAlive()</title>
<updated>2020-02-23T14:58:21Z</updated>
<author>
<name>lhchavez</name>
<email>lhchavez@lhchavez.com</email>
</author>
<published>2020-02-23T14:58:21Z</published>
<link rel='alternate' type='text/html' href='http://cgit.wit.com/jcarr/libgit2/commit/?id=a140f2310f56eb06d37454514e67647a8a49d197'/>
<id>urn:sha1:a140f2310f56eb06d37454514e67647a8a49d197</id>
<content type='text'>
</content>
</entry>
</feed>
