Commit Graph

278 Commits

Author SHA1 Message Date
Frank Benkstein bbdc7a825d add support for annotated tags 2014-06-09 23:19:17 +02:00
Carlos Martín Nieto 3ca566e105 Update travis settings
Build on 1.2 and allow tip to fail. These failures sometimes are our
fault, sometimes go's.
2014-05-31 16:51:51 +02:00
Carlos Martín Nieto 7906bdbdce Merge: merge analysis now returns the user's preference 2014-05-31 16:47:35 +02:00
Carlos Martín Nieto 8a73c75f1a Keep a pointer to the repository in the objects and references
Otherwise, the garbage collector might decide it's a good idea to throw
away the repository instance while the C object still has a pointer to
it. Hilarity ensues.
2014-05-26 09:28:07 +02:00
Carlos Martín Nieto f953d4e5c7 Index: add functions to handle the data structure
Index is not just the index file
2014-05-25 18:12:50 +02:00
Carlos Martín Nieto 2942e18d05 Give Object and Reference an Onwer accessor
This reduces the need to carry around a pointer to the repository as
well as the objects.
2014-05-25 09:12:10 +02:00
Carlos Martín Nieto ec97cb4473 Merge branch 'repo-ext' 2014-05-23 16:02:36 +02:00
cloudson 591a67fef8 Add function to open repository from subpaths 2014-05-23 16:02:30 +02:00
Carlos Martín Nieto 22bcd7decf Reference: expose Peel()
Peel a reference to a particular type of object, returning an Object,
which you then perform a type assertion on.
2014-05-23 11:37:00 +02:00
Carlos Martín Nieto f5e1252d6e Merge pull request #90 from libgit2/unchanify
Remove usage of channels for `ForEach`
2014-05-07 15:12:00 +02:00
Carlos Martín Nieto 7e3c361ac4 Packbuilder: use a callback for ForEach instead of a channel
Channels provide no means to report an error. Closing a channel could
mean anything.

This is particularly important when dealing with IO, which we do quite
often in the pack builder. Use ForEach which returns an error instead.
2014-05-06 14:43:38 +02:00
Carlos Martín Nieto 2594f3f889 Odb: use a callback instead of a channel for ForEach
A channel provides no way to specify whether we stopped sending data
because of an error or because there is no more data.

Therefore, make Odb.ForEach() take a callback with which the user is free to
do whatever they need, letting us return en error.
2014-05-06 14:19:34 +02:00
Carlos Martín Nieto 9a8b80fc13 Fix typo 2014-05-04 15:15:37 +02:00
Carlos Martín Nieto 645a35dfb1 Merge pull request #89 from tchap/set-head
Implement git_repository_set_head(_detached)
2014-05-03 19:20:34 +02:00
Carlos Martín Nieto 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
Carlos Martín Nieto 9c72700765 checkout: init_opts -> init_options 2014-05-03 18:56:44 +02:00
Ondrej Kupka 2cf19370bc Implement git_repository_set_head(_detached)
This closes #88

Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>
2014-05-03 13:55:25 +02:00
Carlos Martín Nieto 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
Carlos Martín Nieto 4df7eb516c Merge pull request #63 from jezell/jezell/merge
Merge functions (in progress)
2014-04-26 20:42:18 +02:00
Carlos Martín Nieto 57f14a2591 Merge commit 'refs/pull/48/head' of github.com:libgit2/git2go 2014-04-26 20:30:57 +02:00
Carlos Martín Nieto 605f942e94 Merge pull request #66 from jezell/branch-iterator
Add branch iterator
2014-04-26 20:25:26 +02:00
Carlos Martín Nieto 3cf0b6db80 Merge pull request #80 from jezell/oid-parse-protection
make it possible to handle errors
2014-04-26 20:24:11 +02:00
Carlos Martín Nieto 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
Carlos Martín Nieto b3a160b0f8 Adjust to libgit2 dev changes
This fixes #87
2014-04-26 18:43:22 +02:00
cloudson 80ad996dc1 Recursive find respository 2014-04-17 08:33:22 -03:00
Jesse Ezell 7cf6b4f082 add set callbacks / set cert check 2014-04-04 09:51:46 -07:00
Jesse Ezell 63fd1f9b03 use cast_ptr instead of ptr for travis go tip build 2014-04-04 09:42:17 -07:00
Jesse Ezell a7d3c5955a merge with improved error handling logic 2014-04-04 00:56:58 -07:00
Jesse Ezell fc999289a2 Merge branch 'oid-parse-protection' into branch-iterator 2014-04-04 00:50:41 -07:00
Jesse Ezell 9d8cbe7547 use cast_ptr instead of ptr for travis go tip build 2014-04-04 00:47:21 -07:00
Jesse Ezell b00cb1a343 Merge remote-tracking branch 'libgit/master' into add-basic-diff-patch 2014-04-04 00:30:05 -07:00
Jesse Ezell 39f59d921b fix typo / return name iterator 2014-04-04 00:27:07 -07:00
Jesse Ezell 8319a792f3 Merge remote-tracking branch 'libgit/master' into branch-iterator 2014-04-04 00:26:22 -07:00
Jesse Ezell 864c57f554 merge latest, copy merge bytes to go array 2014-04-04 00:22:42 -07:00
Jesse Ezell 8982f4b3be adjust comments on error messages to standard godoc style 2014-04-04 00:14:31 -07:00
Aidan Nulman cbc81246af fix for travisci 2014-04-03 17:12:31 -04:00
Aidan Nulman fc70808cb7 update for upstream changes 2014-04-03 16:49:22 -04:00
Aidan Nulman d9f4adff6c Merge branch 'master' into custom_odb
Conflicts:
	odb.go
	wrapper.c
2014-04-03 16:41:43 -04:00
Aidan Nulman b5e60dc106 explicit returns 2014-04-03 16:39:21 -04:00
Jesse Ezell b660db0a4b make it possible to handle errors 2014-04-02 10:31:48 -07:00
Carlos Martín Nieto 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
Carlos Martín Nieto c8ff10933b Merge pull request #77 from jezell/inmemory-to-anon
rename inmemory to anonymous remote
2014-04-01 20:07:58 +02:00
Jesse Ezell 9d0d814f19 rename inmemory to anonymous remote 2014-04-01 11:06:47 -07:00
Carlos Martín Nieto fa41ce8575 Merge pull request #73 from libgit2/cmn/settings
Add a settings package
2014-04-01 12:43:28 +02:00
Carlos Martín Nieto 1b4962cafe Merge pull request #75 from jezell/add-conflict-to-index
Add index conflict functions
2014-04-01 12:43:07 +02:00
Carlos Martín Nieto 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
Carlos Martín Nieto 286ff62b14 Merge pull request #76 from jezell/walk-enhancements
Add missing walk functions
2014-04-01 12:00:20 +02:00
Carlos Martín Nieto 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
Jesse Ezell dcdf2c3555 add conflict functions 2014-03-30 19:53:07 -07:00
Jesse Ezell 552557ba51 add missing walk functions 2014-03-30 13:23:03 -07:00