9b4c865f18
test: adjust to safe commit append
...
When we create a commit and tell the library to update a ref, we need to
make sure to pass the current tip.
This is what we should have been doing in a function called
'upateReadme()' anyway. The existing code creates a new root commit,
which is not an update.
2014-05-03 19:13:32 +02:00
9c72700765
checkout: init_opts -> init_options
2014-05-03 18:56:44 +02:00
5809f03108
Merge commit 'refs/pull/72/head' of github.com:libgit2/git2go
...
Conflicts:
git.go
wrapper.c
2014-04-26 20:51:21 +02:00
4df7eb516c
Merge pull request #63 from jezell/jezell/merge
...
Merge functions (in progress)
2014-04-26 20:42:18 +02:00
57f14a2591
Merge commit 'refs/pull/48/head' of github.com:libgit2/git2go
2014-04-26 20:30:57 +02:00
605f942e94
Merge pull request #66 from jezell/branch-iterator
...
Add branch iterator
2014-04-26 20:25:26 +02:00
3cf0b6db80
Merge pull request #80 from jezell/oid-parse-protection
...
make it possible to handle errors
2014-04-26 20:24:11 +02:00
dca2192492
Merge pull request #81 from jezell/remote-set-callbacks
...
add remote functions to set callbacks / set cert check
2014-04-26 20:22:44 +02:00
b3a160b0f8
Adjust to libgit2 dev changes
...
This fixes #87
2014-04-26 18:43:22 +02:00
7cf6b4f082
add set callbacks / set cert check
2014-04-04 09:51:46 -07:00
63fd1f9b03
use cast_ptr instead of ptr for travis go tip build
2014-04-04 09:42:17 -07:00
a7d3c5955a
merge with improved error handling logic
2014-04-04 00:56:58 -07:00
fc999289a2
Merge branch 'oid-parse-protection' into branch-iterator
2014-04-04 00:50:41 -07:00
9d8cbe7547
use cast_ptr instead of ptr for travis go tip build
2014-04-04 00:47:21 -07:00
b00cb1a343
Merge remote-tracking branch 'libgit/master' into add-basic-diff-patch
2014-04-04 00:30:05 -07:00
39f59d921b
fix typo / return name iterator
2014-04-04 00:27:07 -07:00
8319a792f3
Merge remote-tracking branch 'libgit/master' into branch-iterator
2014-04-04 00:26:22 -07:00
864c57f554
merge latest, copy merge bytes to go array
2014-04-04 00:22:42 -07:00
8982f4b3be
adjust comments on error messages to standard godoc style
2014-04-04 00:14:31 -07:00
cbc81246af
fix for travisci
2014-04-03 17:12:31 -04:00
fc70808cb7
update for upstream changes
2014-04-03 16:49:22 -04:00
d9f4adff6c
Merge branch 'master' into custom_odb
...
Conflicts:
odb.go
wrapper.c
2014-04-03 16:41:43 -04:00
b5e60dc106
explicit returns
2014-04-03 16:39:21 -04:00
b660db0a4b
make it possible to handle errors
2014-04-02 10:31:48 -07:00
9cd1d129bc
Remote: The whole point of the anonymous change
...
Was that it would break and we'd remember that the order changed. Oh
well.
2014-04-01 20:10:20 +02:00
c8ff10933b
Merge pull request #77 from jezell/inmemory-to-anon
...
rename inmemory to anonymous remote
2014-04-01 20:07:58 +02:00
9d0d814f19
rename inmemory to anonymous remote
2014-04-01 11:06:47 -07:00
fa41ce8575
Merge pull request #73 from libgit2/cmn/settings
...
Add a settings package
2014-04-01 12:43:28 +02:00
1b4962cafe
Merge pull request #75 from jezell/add-conflict-to-index
...
Add index conflict functions
2014-04-01 12:43:07 +02:00
a06f4a030a
Adjust to Go tip changes
...
It does not like breaking aliasing rules, so let's keep a casted pointer
for when libgit2 wants that.
2014-04-01 12:36:44 +02:00
286ff62b14
Merge pull request #76 from jezell/walk-enhancements
...
Add missing walk functions
2014-04-01 12:00:20 +02:00
5adb756c48
Merge pull request #74 from fd/master
...
Added force argument for (*Submodule).Reload() and (*Repository).ReloadAllSubmodules()
2014-03-31 17:08:00 +02:00
dcdf2c3555
add conflict functions
2014-03-30 19:53:07 -07:00
552557ba51
add missing walk functions
2014-03-30 13:23:03 -07:00
429408dbe5
Added force argument for (*Submodule).Reload() and (*Repository).ReloadAllSubmodules()
2014-03-27 11:32:22 +01:00
0b48ba2224
Merge analysis and merge file
2014-03-26 14:42:01 -07:00
4553b3ada6
fix go 1.0 compile error
2014-03-26 12:20:54 -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
85420f2002
Merge branch 'master' of http://github.com/libgit2/git2go into merge
2014-03-26 11:18:21 -07:00
b2a2a279d9
Add a settings package
...
This lets us modify the libgit2-wide options/settings.
2014-03-25 09:27:05 +01:00
155f641683
don't expose 3 different diff foreach methods. use structures instead of pointers to structures for diff detail. add patch error code handling. trim excess data from diff structures.
2014-03-21 22:51:38 -07:00
f85c38ce22
Allow diff.ForEach to enumerate files, hunks, and lines with single call. Support use of closures for enumeration.
2014-03-21 17:20:48 -07:00
aea899e877
set ptr to nil after free
2014-03-20 23:19:22 -07:00
d78036fe24
refactor and cleanup code
2014-03-20 22:54:18 -07:00
37964e878f
merge with latest
2014-03-20 22:02:19 -07:00
d0b334b244
cleanup and refactor diff / patch
2014-03-20 21:56:41 -07:00
2811845a12
Merge pull request #71 from jezell/add-index-write-tree-to
...
Add index WriteTreeTo + test
2014-03-21 05:29:57 +01:00
b869775665
Merge pull request #70 from jezell/add-remote-list
...
Add git_remote_list + test
2014-03-21 05:29:05 +01:00
1f3f8adda8
Add index WriteTreeTo + test
2014-03-20 20:49:05 -07:00
Carlos Martín Nieto
Jesse Ezell
Aidan Nulman
Simon Menke