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

branch: Variable names don't repeat its type name any longer

This commit is contained in:
Johann Weging 2013-10-08 14:44:11 +02:00
parent f03cec5375
commit 771e0c11bc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
branch.go
View File

@ -46,8 +46,8 @@ func (repo *Repository) BranchCreate(branchName string, target *Commit, force bo
return ref, nil return ref, nil
} }
func (branch *Branch) BranchDelete() error { func (b *Branch) BranchDelete() error {
if err := C.git_branch_delete(branch.ptr); err < 0 { if err := C.git_branch_delete(b.ptr); err < 0 {
return LastError() return LastError()
} }
return nil return nil
@ -90,20 +90,20 @@ func (repo *Repository) BranchForeach(flags ListFlags, callback BranchForeachCB,
return err return err
} }
func (branch *Branch) Move(newBranchName string, force bool) (*Branch, error) { func (b *Branch) Move(newBranchName string, force bool) (*Branch, error) {
newBranch := new(Branch) newBranch := new(Branch)
cNewBranchName := C.CString(newBranchName) cNewBranchName := C.CString(newBranchName)
cForce := cbool(force) cForce := cbool(force)
err := C.git_branch_move(&newBranch.ptr, branch.ptr, cNewBranchName, cForce) err := C.git_branch_move(&newBranch.ptr, b.ptr, cNewBranchName, cForce)
if err < 0 { if err < 0 {
return nil, LastError() return nil, LastError()
} }
return newBranch, nil return newBranch, nil
} }
func (branch *Branch) IsHead() (bool, error) { func (b *Branch) IsHead() (bool, error) {
isHead := C.git_branch_is_head(branch.ptr) isHead := C.git_branch_is_head(b.ptr)
switch isHead { switch isHead {
case 1: case 1:
return true, nil return true, nil
@ -115,22 +115,22 @@ func (branch *Branch) IsHead() (bool, error) {
} }
func (repo *Repository) BranchLookup(branchName string, branchType BranchType) (*Branch, error) { func (repo *Repository) BranchLookup(branchName string, bt BranchType) (*Branch, error) {
branch := new(Branch) branch := new(Branch)
cName := C.CString(branchName) cName := C.CString(branchName)
err := C.git_branch_lookup(&branch.ptr, repo.ptr, cName, C.git_branch_t(branchType)) err := C.git_branch_lookup(&branch.ptr, repo.ptr, cName, C.git_branch_t(bt))
if err < 0 { if err < 0 {
return nil, LastError() return nil, LastError()
} }
return branch, nil return branch, nil
} }
func (branch *Branch) Name() (string, error) { func (b *Branch) Name() (string, error) {
var cName *C.char var cName *C.char
defer C.free(unsafe.Pointer(cName)) defer C.free(unsafe.Pointer(cName))
err := C.git_branch_name(&cName, branch.ptr) err := C.git_branch_name(&cName, b.ptr)
if err < 0 { if err < 0 {
return "", LastError() return "", LastError()
} }
@ -159,19 +159,19 @@ func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
return C.GoString(cBuf), nil return C.GoString(cBuf), nil
} }
func (branch *Branch) SetUpstream(upstreamName string) error { func (b *Branch) SetUpstream(upstreamName string) error {
cName := C.CString(upstreamName) cName := C.CString(upstreamName)
err := C.git_branch_set_upstream(branch.ptr, cName) err := C.git_branch_set_upstream(b.ptr, cName)
if err < 0 { if err < 0 {
return LastError() return LastError()
} }
return nil return nil
} }
func (branch *Branch) Upstream() (*Branch, error) { func (b *Branch) Upstream() (*Branch, error) {
upstream := new(Branch) upstream := new(Branch)
err := C.git_branch_upstream(&upstream.ptr, branch.ptr) err := C.git_branch_upstream(&upstream.ptr, b.ptr)
if err < 0 { if err < 0 {
return nil, LastError() return nil, LastError()
} }