jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

go fmt

This commit is contained in:
Mark Probst 2015-03-04 11:40:26 -08:00
parent e439b931a6
commit 45d88ca5f4
6 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
object.go
View File

@ -25,12 +25,12 @@ type Object interface {
} }
type gitObject struct { type gitObject struct {
ptr *C.git_object ptr *C.git_object
repo *Repository repo *Repository
} }
func (t ObjectType) String() (string) { func (t ObjectType) String() string {
switch (t) { switch t {
case ObjectAny: case ObjectAny:
return "Any" return "Any"
case ObjectBad: case ObjectBad:
@ -71,7 +71,7 @@ func (o *gitObject) Free() {
func allocObject(cobj *C.git_object, repo *Repository) Object { func allocObject(cobj *C.git_object, repo *Repository) Object {
obj := gitObject{ obj := gitObject{
ptr: cobj, ptr: cobj,
repo: repo, repo: repo,
} }

8
odb.go
View File

@ -94,7 +94,7 @@ type OdbForEachCallback func(id *Oid) error
type foreachData struct { type foreachData struct {
callback OdbForEachCallback callback OdbForEachCallback
err error err error
} }
//export odbForEachCb //export odbForEachCb
@ -111,9 +111,9 @@ func odbForEachCb(id *C.git_oid, payload unsafe.Pointer) int {
} }
func (v *Odb) ForEach(callback OdbForEachCallback) error { func (v *Odb) ForEach(callback OdbForEachCallback) error {
data := foreachData { data := foreachData{
callback: callback, callback: callback,
err: nil, err: nil,
} }
runtime.LockOSThread() runtime.LockOSThread()
@ -138,7 +138,7 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype)); ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype))
if ret < 0 { if ret < 0 {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }

4
odb_test.go
View File

@ -1,9 +1,9 @@
package git package git
import ( import (
"errors"
"io" "io"
"os" "os"
"errors"
"testing" "testing"
) )
@ -37,7 +37,7 @@ func TestOdbStream(t *testing.T) {
func TestOdbHash(t *testing.T) { func TestOdbHash(t *testing.T) {
repo := createTestRepo(t) repo := createTestRepo(t)
defer os.RemoveAll(repo.Workdir()) defer os.RemoveAll(repo.Workdir())
_, _ = seedTestRepo(t, repo) _, _ = seedTestRepo(t, repo)

2
packbuilder.go
View File

@ -128,7 +128,7 @@ func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Poin
func (pb *Packbuilder) ForEach(callback PackbuilderForeachCallback) error { func (pb *Packbuilder) ForEach(callback PackbuilderForeachCallback) error {
data := packbuilderCbData{ data := packbuilderCbData{
callback: callback, callback: callback,
err: nil, err: nil,
} }
runtime.LockOSThread() runtime.LockOSThread()

31
status.go
View File

@ -45,7 +45,7 @@ func statusEntryFromC(statusEntry *C.git_status_entry) StatusEntry {
indexToWorkdir = diffDeltaFromC(statusEntry.index_to_workdir) indexToWorkdir = diffDeltaFromC(statusEntry.index_to_workdir)
} }
return StatusEntry { return StatusEntry{
Status: Status(statusEntry.status), Status: Status(statusEntry.status),
HeadToIndex: headToIndex, HeadToIndex: headToIndex,
IndexToWorkdir: indexToWorkdir, IndexToWorkdir: indexToWorkdir,
@ -96,20 +96,20 @@ func (statusList *StatusList) EntryCount() (int, error) {
type StatusOpt int type StatusOpt int
const ( const (
StatusOptIncludeUntracked StatusOpt = C.GIT_STATUS_OPT_INCLUDE_UNTRACKED StatusOptIncludeUntracked StatusOpt = C.GIT_STATUS_OPT_INCLUDE_UNTRACKED
StatusOptIncludeIgnored StatusOpt = C.GIT_STATUS_OPT_INCLUDE_IGNORED StatusOptIncludeIgnored StatusOpt = C.GIT_STATUS_OPT_INCLUDE_IGNORED
StatusOptIncludeUnmodified StatusOpt = C.GIT_STATUS_OPT_INCLUDE_UNMODIFIED StatusOptIncludeUnmodified StatusOpt = C.GIT_STATUS_OPT_INCLUDE_UNMODIFIED
StatusOptExcludeSubmodules StatusOpt = C.GIT_STATUS_OPT_EXCLUDE_SUBMODULES StatusOptExcludeSubmodules StatusOpt = C.GIT_STATUS_OPT_EXCLUDE_SUBMODULES
StatusOptRecurseUntrackedDirs StatusOpt = C.GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS StatusOptRecurseUntrackedDirs StatusOpt = C.GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS
StatusOptDisablePathspecMatch StatusOpt = C.GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH StatusOptDisablePathspecMatch StatusOpt = C.GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH
StatusOptRecurseIgnoredDirs StatusOpt = C.GIT_STATUS_OPT_RECURSE_IGNORED_DIRS StatusOptRecurseIgnoredDirs StatusOpt = C.GIT_STATUS_OPT_RECURSE_IGNORED_DIRS
StatusOptRenamesHeadToIndex StatusOpt = C.GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX StatusOptRenamesHeadToIndex StatusOpt = C.GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX
StatusOptRenamesIndexToWorkdir StatusOpt = C.GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR StatusOptRenamesIndexToWorkdir StatusOpt = C.GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR
StatusOptSortCaseSensitively StatusOpt = C.GIT_STATUS_OPT_SORT_CASE_SENSITIVELY StatusOptSortCaseSensitively StatusOpt = C.GIT_STATUS_OPT_SORT_CASE_SENSITIVELY
StatusOptSortCaseInsensitively StatusOpt = C.GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY StatusOptSortCaseInsensitively StatusOpt = C.GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY
StatusOptRenamesFromRewrites StatusOpt = C.GIT_STATUS_OPT_RENAMES_FROM_REWRITES StatusOptRenamesFromRewrites StatusOpt = C.GIT_STATUS_OPT_RENAMES_FROM_REWRITES
StatusOptNoRefresh StatusOpt = C.GIT_STATUS_OPT_NO_REFRESH StatusOptNoRefresh StatusOpt = C.GIT_STATUS_OPT_NO_REFRESH
StatusOptUpdateIndex StatusOpt = C.GIT_STATUS_OPT_UPDATE_INDEX StatusOptUpdateIndex StatusOpt = C.GIT_STATUS_OPT_UPDATE_INDEX
) )
type StatusShow int type StatusShow int
@ -173,7 +173,6 @@ func (v *Repository) StatusList(opts *StatusOptions) (*StatusList, error) {
return newStatusListFromC(ptr), nil return newStatusListFromC(ptr), nil
} }
func (v *Repository) StatusFile(path string) (Status, error) { func (v *Repository) StatusFile(path string) (Status, error) {
var statusFlags C.uint var statusFlags C.uint
cPath := C.CString(path) cPath := C.CString(path)

2
tag_test.go
View File

@ -2,8 +2,8 @@ package git
import ( import (
"os" "os"
"time"
"testing" "testing"
"time"
) )
func TestCreateTag(t *testing.T) { func TestCreateTag(t *testing.T) {