Commit Graph

783 Commits

Author SHA1 Message Date
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
Calin Seciu c6f394e407 Merge branch 'next' into stash-support 2016-02-20 14:52:57 +02:00
Calin Seciu dc4409793d Remove Untrack() from free() function
https://github.com/libgit2/git2go/pull/257#discussion_r53443211
2016-02-20 14:44:20 +02:00
Calin Seciu 5191254a66 Fix problems based on PR comments
https://github.com/libgit2/git2go/pull/257#discussion_r53432957
https://github.com/libgit2/git2go/pull/257#discussion_r53443418
2016-02-20 14:43:46 +02: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
Carlos Martín Nieto 2e17c3d55f Merge pull request #280 from ebfe/hint-path
Don't drop CreateBlobFromChunks hintPath argument
2016-01-15 22:22:36 +01:00
Ian Lance Taylor 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
Michael Gehring 51d3ead30d Don't drop CreateBlobFromChunks hintPath argument 2016-01-04 15:02:21 +01:00
Carlos Martín Nieto 105573ac7a Merge pull request #275 from clearr/index-find
Add Index.Find() and Index.FindPrefix()
2015-12-29 13:21:41 +00:00
FUJII Ryota 20ab28bfea Add Index.Find() and Index.FindPrefix() 2015-12-21 18:19:03 +09:00
Carlos Martín Nieto 9022ab9c19 Merge pull request #273 from clearr/fix-index-entrybypath-leak
Fix a memory leak in Index.EntryByPath()
2015-12-16 15:19:35 +01:00
FUJII Ryota 1cdf1d70a2 Fix a memory leak in Index.EntryByPath() 2015-12-16 16:43:26 +09:00
Carlos Martín Nieto 4ee13db86d Merge pull request #271 from joseferminj/fix-memory-problems
Fix Fetch/Push memory allocation problems
2015-11-13 18:33:02 +01:00
Jose Alvarez 92d736d12c Fix Fetch/Push memory allocation problems
The Fetch/Push operations didn't allocate the git_*_options structure
and this causes a memory problem in the libgit2 code. Following the
example of Clone operation, the Fetch/Push functions allocates the
options structure before calling the C.
2015-11-12 21:15:24 -05:00
Carlos Martín Nieto f05a6a3384 Merge pull request #269 from durin42/small-fixes
Small fixes I noticed while perusing the code.
2015-11-03 08:30:59 -08:00
Augie Fackler 714cd56c71 odb: remove debug fmt.Printlns
These appear to be left over debug statements, and they also look like
they were intended to be fmt.Printf calls anyway.
2015-11-02 16:00:19 -05:00
Augie Fackler f18ea412dc config_test: properly detect failed config writes
This patch fixes the setup stage of the config tests to notice when
the writes fail (eg $PWD is a read-only filesystem) and to correctly
skip the entire test function as a result.
2015-11-02 16:00:04 -05:00
Carlos Martín Nieto c646a2eb30 Merge pull request #268 from clearr/fix-index-leaks
Fix memory leaks in NewIndex() and OpenIndex()
2015-10-29 13:04:01 +01:00
FUJII Ryota ae107d5f56 Fix memory leaks in NewIndex() and OpenIndex() 2015-10-27 15:20:50 +09:00
Carlos Martín Nieto 749963ce55 Merge pull request #266 from clns/update-libgit2
[next] Update libgit2 to 821131f
2015-10-26 21:44:16 +01:00