Commit Graph

647 Commits

Author SHA1 Message Date
Carlos Martín Nieto a3c2ac18dc Merge pull request #347 from geordie/master
Write index before writing index tree in seedTestRepo test helper
2016-10-03 02:37:05 -07:00
Carlos Martín Nieto c94904ea37 Merge pull request #341 from mdaffin/branchiterator-foreach-errors
Add check for ErrIterOver in BranchIterator.ForEach
2016-10-03 02:31:58 -07:00
Carlos Martín Nieto ddc1515c8e Merge commit 'refs/pull/331/head' of github.com:libgit2/git2go 2016-10-03 11:28:38 +02:00
Geordie Henderson a16e24a99e Write the index before writing the index tree in seedTestRepo test helper func 2016-09-16 21:49:54 -07:00
Michael Daffin 74bc3c6242 Add check for ErrIterOver in BranchIterator.ForEach
The BranchIterator.ForEach currently returns the ErrIterOver error if no
error had occured during the iteration. This leads to a rather unhelpful
blank error message with the error code -31 when iterating over the
branches.

This commit adds a check for ErrIterOver at the end of the ForEach
method so that the client code only has to worry about checking for nil
as apose to checking for the ErrIterOver error.
2016-09-05 15:56:09 +01:00
Alan Johnson 208cdaef76 Removes redundant iteration over check. 2016-08-29 09:10:56 -04:00
Carlos Martín Nieto 241aa34d83 Merge pull request #336 from libgit2/cmn/test-parallel
Run the tests in parallel
2016-08-27 21:03:29 +02:00
Carlos Martín Nieto e1467c0641 Merge pull request #337 from libgit2/cmn/go16-blob-pointer
Work around the finnicky 1.6 CGo pointer checks
2016-08-27 21:02:47 +02:00
Carlos Martín Nieto 5c678353fa Add Go 1.7 to the build list 2016-08-27 20:52:07 +02:00
Carlos Martín Nieto b41e4c4ac7 Work around Go 1.6's CGo pointer check
It depends heavily on the expression at the call site an whether it can
figure out whether we're using a slice or not, so provid an incantation
that does this.
2016-08-27 20:51:13 +02:00
Carlos Martín Nieto b5d213c2c1 Remove unecessary copy 2016-08-27 20:47:41 +02:00
Itamar Turner-Trauring 3c1ba8c40e Add test for slice-to-slice and GCo pointer detection 2016-08-27 20:47:01 +02:00
Carlos Martín Nieto 0703dae9b2 Merge pull request #320 from netnose/enum-mappings
Enum Mappings
2016-08-27 19:27:10 +02:00
Carlos Martín Nieto e55c00eca7 Run the tests in parallel
This saves about 1s, or 1/3 of the test runtime. The linking is still
much slower, but this we can control.
2016-08-27 19:21:05 +02:00
Carlos Martín Nieto 1670c49c7e Merge pull request #323 from Coderlane/diff_stats_string
Add DiffStats String
2016-08-05 16:23:34 +02:00
Alan Johnson 380684bb10 Fixing issue with error conversion. 2016-08-04 09:43:44 -04:00
Carlos Martín Nieto f720800b50 Merge pull request #318 from netnose/tag-remove
Tag Remove
2016-07-06 23:54:40 +02:00
Carlos Martín Nieto 30cffcb526 Merge pull request #317 from netnose/reset-default
ResetDefaultToCommit maps git_reset_default
2016-07-06 23:53:43 +02:00
Travis Lane 981538924c diff: Add DiffStats String
This implements git_diff_stats_to_buf which provides the output for
git diff --stats.
2016-06-19 15:19:39 -07:00
Mirko Nosenzo 82f86f2f13 StatusConflicted maps GIT_STATUS_CONFLICTED
Added support for file in conflicted status
2016-05-29 15:01:17 +02:00
Mirko Nosenzo 298f2e2111 BranchAll maps GIT_BRANCH_ALL
Added support to All Branch Iteration and Lookup
2016-05-29 15:01:07 +02:00
Mirko Nosenzo 8b855ce765 Tag Remove
Added support for removal of a Tag
2016-05-29 14:57:00 +02:00
Mirko Nosenzo 8919236801 ResetDefaultToCommit maps git_reset_default
Added support for default reset behavior
2016-05-29 14:53:26 +02:00
Carlos Martín Nieto 8eaae73f85 Error out if we detect an incompatible libgit2 version
The master version supports only v0.24 so let's enforce that via the
compiler.
2016-04-27 14:53:21 +02:00
Carlos Martín Nieto 95793ac11d Merge pull request #298 from hirochachacha/add_git_diff_tree_to_index
Add git_diff_tree_to_index
2016-03-11 14:34:20 +01:00
Hiroshi Ioka 975228d55c add DiffTreeToIndex
This is equivalent to `git diff --cached <treeish` or `diff --cached`.
2016-03-11 02:25:33 +09:00
Carlos Martín Nieto d3bd8903f8 Update libgit2 version to install on Travis to 24 2016-03-07 11:33:44 +01:00
Carlos Martín Nieto 2ae7d13ba1 Merge branch 'next' 2016-03-07 11:22:53 +01:00
Carlos Martín Nieto e095c85fd0 Update to 785d8c 2016-03-07 11:16:07 +01:00
Carlos Martín Nieto 251d89e1d4 Update vendored libgit2 2016-02-19 13:59:50 +01:00
Carlos Martín Nieto 6941cccb69 Merge branch 'master' into next 2016-02-18 20:11:54 +01:00
Carlos Martín Nieto fa644d2fc9 Merge pull request #296 from libgit2/cmn/track-real-pointers
handles: use real pointers to keep track of handles
2016-02-18 18:43:56 +01:00
Carlos Martín Nieto f1240e6565 handles: use real pointers to keep track of handles
With the change to 1.6 rules, we couldn't use the Go pointers, so we
went with casting the list indices into pointers.

The runtime does not like this, however. It will sometimes detect that
we have a pointer with a very small value and consider it an invalid
pointer, bringing down the application with it.

Work around that by asking libc for the smallest amount of memory it'll
give us so we have an actual allocated pointer to use. We then use this
pointer value as the key in our map to find the Go object we're
tracking.
2016-02-18 17:33:44 +01:00
Carlos Martín Nieto ac719c6759 Merge branch 'master' into next 2016-02-18 15:57:46 +01:00
Carlos Martín Nieto 4a9a59c6fa Merge commit 'refs/pull/285/head' of github.com:libgit2/git2go into next 2016-02-18 15:43:58 +01:00
Carlos Martín Nieto f05417aaba Merge pull request #282 from ianlancetaylor/master
handles, merge, odb: changes for Go 1.6 pointer passing rules
2016-02-18 13:10:08 +01:00
Han-Wen Nienhuys 090dc7ee39 Use Filemode in TreeBuilder.Insert, and add test coverage for some
TreeBuilder methods.
2016-02-17 18:23:52 +01:00
Han-Wen Nienhuys aa59dccea7 Upgrade to libgit2 to 0f9d15493d5d8ad4353dd7beed52c9567334f6e5 2016-02-17 18:23:52 +01:00
Ian Lance Taylor dc8b154f4f odb: don't copy buffer 2016-02-16 21:40:05 -08:00
Ian Lance Taylor ddbf1baab1 merge: remove whitespace change 2016-02-16 21:36:57 -08:00
Ian Lance Taylor a1f25eafec handles, merge: simplify code, don't copy file contents 2016-02-16 21:34:43 -08:00
Ian Lance Taylor b70973e5c7 Merge remote-tracking branch 'upstream/master' 2016-02-16 21:06:45 -08:00
Carlos Martín Nieto 6d6736b2bd Merge remote-tracking branch 'upstream/master' into next 2016-02-15 15:02:19 +01:00
Carlos Martín Nieto 55594814c9 Merge pull request #263 from joseferminj/master
Expose AddGitIgnoreRules and ClearGitIgnoreRules funcs
2016-02-15 14:47:53 +01:00
Carlos Martín Nieto ae1de83894 Merge pull request #292 from orivej/git_revwalk_simplify_first_parent
Add RevWalk.SimplifyFirstParent()
2016-02-09 06:03:27 +01:00
Orivej Desh b876e836fa Add RevWalk.SimplifyFirstParent() 2016-02-07 03:15:40 +00:00
Carlos Martín Nieto 4a7794664e Merge pull request #288 from hanwen/readheader
Expose git_odb_read_header as Odb.ReadHeader.
2016-02-06 13:16:59 -08:00
Han-Wen Nienhuys 773ac24a16 Expose git_odb_read_header as Odb.ReadHeader.
This function is much faster for discovering sizes for a given OID.
2016-02-03 15:56:39 +01:00
Carlos Martín Nieto 6d60e0f2c9 Merge pull request #283 from ebfe/repo-open
Add missing RepositoryOpenExtended arguments
2016-01-16 01:44:09 +01:00
Michael Gehring 1bc7cf60bd Add missing RepositoryOpenExtended arguments
Fixes #277
2016-01-15 22:31:21 +01:00