lhchavez
10c67474a8
This change: * Gets rid of the `.toC()` functions for Options objects, since they were redundant with the `populateXxxOptions()`. * Adds support for `errorTarget` to the `RemoteOptions`, since they are used in the same stack for some functions (like `Fetch()`). Now for those cases, the error returned by the callback will be preserved as-is.
50 lines
1.1 KiB
Go
50 lines
1.1 KiB
Go
package git
|
|
|
|
/*
|
|
#include <git2.h>
|
|
*/
|
|
import "C"
|
|
import "runtime"
|
|
|
|
type ResetType int
|
|
|
|
const (
|
|
ResetSoft ResetType = C.GIT_RESET_SOFT
|
|
ResetMixed ResetType = C.GIT_RESET_MIXED
|
|
ResetHard ResetType = C.GIT_RESET_HARD
|
|
)
|
|
|
|
func (r *Repository) ResetToCommit(commit *Commit, resetType ResetType, opts *CheckoutOptions) error {
|
|
runtime.LockOSThread()
|
|
defer runtime.UnlockOSThread()
|
|
|
|
var err error
|
|
cOpts := populateCheckoutOptions(&C.git_checkout_options{}, opts, &err)
|
|
defer freeCheckoutOptions(cOpts)
|
|
|
|
ret := C.git_reset(r.ptr, commit.ptr, C.git_reset_t(resetType), cOpts)
|
|
if ret == C.int(ErrorCodeUser) && err != nil {
|
|
return err
|
|
}
|
|
if ret < 0 {
|
|
return MakeGitError(ret)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (r *Repository) ResetDefaultToCommit(commit *Commit, pathspecs []string) error {
|
|
cpathspecs := C.git_strarray{}
|
|
cpathspecs.count = C.size_t(len(pathspecs))
|
|
cpathspecs.strings = makeCStringsFromStrings(pathspecs)
|
|
defer freeStrarray(&cpathspecs)
|
|
|
|
runtime.LockOSThread()
|
|
defer runtime.UnlockOSThread()
|
|
ret := C.git_reset_default(r.ptr, commit.ptr, &cpathspecs)
|
|
|
|
if ret < 0 {
|
|
return MakeGitError(ret)
|
|
}
|
|
return nil
|
|
}
|