33dac3d460
Provide missing merge flags ( #615 )
...
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.
2020-06-04 20:34:37 -07:00
a140f2310f
Add test and runtime.KeepAlive()
2020-02-23 14:58:21 +00:00
627447092f
Merge remote-tracking branch 'upstream/master' into more-annotated-commit
2020-02-23 14:49:04 +00:00
97e6392d3a
Adjust to libgit2 changes
2019-12-10 22:15:32 +00:00
e319b9427f
Merge pull request #425 from josharian/more-merge-file-flags
...
merge: add missing MergeFileFlag constants
2019-01-02 23:58:19 +01:00
661e1a6f1b
merge: expose the conflict marker size option
2018-02-22 09:46:42 +01:00
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
03339f731a
merge: add two missing AnnotatedCommit methods
2018-01-25 16:00:39 -08:00
55a1096141
Third round of keep-alive aditions
2017-07-08 16:07:51 +02:00
ac719c6759
Merge branch 'master' into next
2016-02-18 15:57:46 +01:00
aa59dccea7
Upgrade to libgit2 to 0f9d15493d5d8ad4353dd7beed52c9567334f6e5
2016-02-17 18:23:52 +01:00
ddbf1baab1
merge: remove whitespace change
2016-02-16 21:36:57 -08:00
a1f25eafec
handles, merge: simplify code, don't copy file contents
2016-02-16 21:34:43 -08:00
6d6736b2bd
Merge remote-tracking branch 'upstream/master' into next
2016-02-15 15:02:19 +01:00
42b11d403d
handles, merge, odb: changes for Go 1.6 pointer passing rules
...
See http://tip.golang.org/cmd/cgo/#hdr-Passing_pointers .
2016-01-07 18:37:46 -08:00
3b5633de21
Mention that MergeAnalysis is a bitmask
2015-10-26 21:22:22 +01:00
367cd8eb9b
Update libgit2 to 821131f
...
The API changes are:
- `*Remote.Connect`
```go
// from:
func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks) error
// to:
func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks, headers []string) error
```
- `*Remote.ConnectFetch` - `headers` was added as above
- `*Remote.ConnectPush` - `headers` was added as above
2015-10-26 16:20:18 +02:00
0522886781
Merge remote-tracking branch 'origin/master' into next
2015-09-18 10:52:37 +02:00
d5890f58e8
Run go fmt
...
As it seems to be something that many people can't get over, reformat
all the files; as we're breaking things, whoever depended on 'next' will
have to take many changes into account anyway, so let's include this to
reduce the noise of incoming patches.
2015-08-31 20:22:17 +02:00
f72db33baf
Merge branch 'next'
2015-08-31 13:55:46 +02:00
37bb1a6025
merge: fix memory leak related to merge file opts
2015-08-12 10:24:59 +02:00
47949510f1
Merge remote-tracking branch 'origin/master' into next
2015-08-04 14:59:10 +02:00
efd61a4bc0
Wrap MergeBases
...
While here, test MergeBase as well.
2015-07-31 11:37:18 +02:00
b374e16db8
Update to libgit2 4c02d3937
2015-04-18 04:50:39 +02:00
92a1f92d91
Add TargetDirectory field to Checkout options.
...
TargetDirectory field indicates a alternative checkout path to workdir.
2015-01-29 15:17:46 +01:00
a9d993f3d1
Remove useless includes
2014-12-11 02:59:07 +01:00
8c631b0c25
Add missing thread locking
2014-12-06 02:45:26 +01:00
1d759e3697
Update to master
2014-12-03 17:26:55 +01:00
ff65faa082
Fix MergeTrees func to accept nil as ancestor parameter
2014-11-08 19:07:21 -05:00
668aa5dae1
Make the constants have types
...
While Go will assign the correct type to a const block when it
auto-creates the values, assigning makes the const be typeless and will
only gain it in each particular use.
Make each constant in the blocks have an assigned type.
2014-10-28 11:29:31 +01:00
7906bdbdce
Merge: merge analysis now returns the user's preference
2014-05-31 16:47:35 +02:00
9d8cbe7547
use cast_ptr instead of ptr for travis go tip build
2014-04-04 00:47:21 -07:00
864c57f554
merge latest, copy merge bytes to go array
2014-04-04 00:22:42 -07:00
0b48ba2224
Merge analysis and merge file
2014-03-26 14:42:01 -07:00
eff3a8b4d0
support nil merge options
2014-03-26 12:17:23 -07:00
50a3c4aa09
update to new merge API
2014-03-26 11:28:48 -07:00
6a068d5265
remove useless wrappers
2014-03-11 12:47:56 -07:00
e5946d4009
Add defaults, add simple test, merge heads should be pointer array
2014-02-28 14:33:38 -08:00
6af4d4a825
move finalizer above free
2014-02-28 11:15:39 -08:00
da64faf8bd
switch from iota to explicit def
2014-02-28 11:13:51 -08:00
5f5906878e
merge options / merge tree options
2014-02-28 01:31:01 -08:00
9e7ba02708
wrap merge functions
2014-02-28 01:06:41 -08:00
Takuji Shimokawa
lhchavez
Carlos Martín Nieto
Carlos Martín Nieto
Josh Bleecher Snyder
Han-Wen Nienhuys
Ian Lance Taylor
Calin Seciu
Patrick Steinhardt
joseferminj
Jesse Ezell