Commit Graph

972 Commits

Author SHA1 Message Date
Carlos Martín Nieto 92fa6357ae Bring back the Makefile from 'next' 2016-08-27 21:11:22 +02:00
Carlos Martín Nieto aadd0c2035 Merge remote-tracking branch 'upstream/master' into next 2016-08-27 21:07:44 +02: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
ezwiebel b2d71f4fbc Fix Free() service in Rebase wrapper 2016-08-08 10:49:40 +10:00
ezwiebel 193b21398b Add CurrentOperationIndex() and OperationAt(index uint) services to wrapper 2016-08-07 18:09:33 +10:00
ezwiebel e1f0949740 Add Abort() service to wrapper 2016-08-07 17:48:18 +10:00
ezwiebel a62a8c3b92 Add operation OperationCount() service and enrich UTs 2016-08-07 17:48:18 +10:00
ezwiebel b1a9de8037 Initial rebase wrapper version 2016-08-07 17:48:18 +10: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
Carlos Martín Nieto 37d3c2d9ad Update libgit2 to 73dab769
This version reloads the index on checkout, which showed we were not
persisting the updated index to disk and thus would have conflicts on
checkout.
2016-08-05 15:15:22 +02:00
Alan Johnson 380684bb10 Fixing issue with error conversion. 2016-08-04 09:43:44 -04:00
Carlos Martín Nieto 3ed398a78e Merge pull request #328 from navytux/y/odb-type
odb: Expose git_odb_object_type() as OdbObject.Type()
2016-07-24 18:09:12 +02:00
Mirko Nosenzo aa7dfab1cf
Clone Fix
freeCheckoutOpts called twice
2016-07-24 14:20:12 +02:00
Kirill Smelkov cf7553e72c odb: Expose git_odb_object_type() as OdbObject.Type()
It might be needed when one is writing `git cat-file --batch` equivalent
which has output format

    <sha1> SP <type> SP <size> LF
    <contents> LF
2016-07-19 22:48:52 +03:00
Mirko Nosenzo c6b94a160e
Returning Problems on Remote Rename
Problems can be returned as string array on RemoteCollection Rename
2016-07-07 12:01:24 +02: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
Mirko Nosenzo 6fa4c8ea15 Checkout Payload Pointer Fix
- Tracking pointer once
- Tracking pointer and not struct
2016-06-25 11:39:44 +02:00
David Calavera a2f93e91d2
Add NewCredSshKeyFromMemory to the credentials helpers.
Allowing to use public and private keys from memory
without reading them from disk and without using an
ssh agent.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-06-22 14:50:29 -07: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 18802c24e3 Checkout Callbacks Payload Check in Callback Functions
Checking payloads in callback functions
2016-05-29 15:27:48 +02:00
Mirko Nosenzo db6f44c71c Checkout Callbacks Payload Check
Checking payloads before using them
2016-05-29 15:14:16 +02: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 393098522c Remote Refinements
- Fixed credentialsCallback return value for missing callback
- Added Remote Rename
- Added Remote Disconnect
2016-05-29 14:59:17 +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
Mirko Nosenzo 278dc9ac4f Checkout Callbacks
- Added CheckoutNotifyType mapping git_checkout_notify_t
- Added CheckoutOpts.NotifyFlags of type CheckoutNotifyType
- Added CheckoutNotifyCallback mapping git_checkout_notify_cb
- Added CheckoutProgressCallback mapping git_checkout_progress_cb
2016-05-29 13:44:18 +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 9163ca7d50 Update to 1dc4491 2016-04-23 15:35:22 +02:00
Carlos Martín Nieto 652a14f732 Merge pull request #301 from hansrodtang/next
Add some constants and repository methods.
2016-03-31 04:44:23 -07:00
Hans Rødtang 2be7d7987b Add Repository.IsShallow 2016-03-29 20:42:41 +02:00
Hans Rødtang 726331dfde Add Repository.IsEmpty 2016-03-29 20:42:30 +02:00
Hans Rødtang b99dbb1361 Add Repository.IsHeadUnborn 2016-03-29 20:42:19 +02:00
Hans Rødtang 094bb3767b Add unimplemented diff delta/flag values. 2016-03-29 20:41:46 +02:00
Hans Rødtang 1e8b7ef380 Add "Conflicted" git.Delta and git.Status. 2016-03-29 20:37:22 +02:00
Carlos Martín Nieto 836b6c56be Merge pull request #257 from clns/stash-support
[next] Add stash support
2016-03-17 18:14:30 +01: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
Calin Seciu 71ff6ab0d5 Fix error after updating to latest changes 2016-02-20 14:58:48 +02:00