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

fix: Use err instead of error as a variable name for errors (#746) #749

Merged
github-actions[bot] merged 1 commits from cherry-pick-568955533-release-0.27 into release-0.27 2021-02-15 15:57:38 -06:00
Conversation 0 Commits 1 Files Changed 2 +22 -22
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.go
View File

@ -196,9 +196,9 @@ func NewOid(s string) (*Oid, error) {
o := new(Oid)
slice, error := hex.DecodeString(s)
if error != nil {
return nil, error
slice, err := hex.DecodeString(s)
if err != nil {
return nil, err
}
if len(slice) != 20 {

38
odb_test.go
View File

@ -61,31 +61,31 @@ func TestOdbStream(t *testing.T) {
_, _ = seedTestRepo(t, repo)
odb, error := repo.Odb()
checkFatal(t, error)
odb, err := repo.Odb()
checkFatal(t, err)
str := "hello, world!"
writeStream, error := odb.NewWriteStream(int64(len(str)), ObjectBlob)
checkFatal(t, error)
n, error := io.WriteString(writeStream, str)
checkFatal(t, error)
writeStream, err := odb.NewWriteStream(int64(len(str)), ObjectBlob)
checkFatal(t, err)
n, err := io.WriteString(writeStream, str)
checkFatal(t, err)
if n != len(str) {
t.Fatalf("Bad write length %v != %v", n, len(str))
}
error = writeStream.Close()
checkFatal(t, error)
err = writeStream.Close()
checkFatal(t, err)
expectedId, error := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
checkFatal(t, error)
expectedId, err := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
checkFatal(t, err)
if writeStream.Id.Cmp(expectedId) != 0 {
t.Fatal("Wrong data written")
}
readStream, error := odb.NewReadStream(&writeStream.Id)
checkFatal(t, error)
data, error := ioutil.ReadAll(readStream)
readStream, err := odb.NewReadStream(&writeStream.Id)
checkFatal(t, err)
data, err := ioutil.ReadAll(readStream)
if str != string(data) {
t.Fatalf("Wrong data read %v != %v", str, string(data))
}
@ -98,8 +98,8 @@ func TestOdbHash(t *testing.T) {
_, _ = seedTestRepo(t, repo)
odb, error := repo.Odb()
checkFatal(t, error)
odb, err := repo.Odb()
checkFatal(t, err)
str := `tree 115fcae49287c82eb55bb275cbbd4556fbed72b7
parent 66e1c476199ebcd3e304659992233132c5a52c6c
@ -109,11 +109,11 @@ committer John Doe <john@doe.com> 1390682018 +0000
Initial commit.`
for _, data := range [][]byte{[]byte(str), doublePointerBytes()} {
oid, error := odb.Hash(data, ObjectCommit)
checkFatal(t, error)
oid, err := odb.Hash(data, ObjectCommit)
checkFatal(t, err)
coid, error := odb.Write(data, ObjectCommit)
checkFatal(t, error)
coid, err := odb.Write(data, ObjectCommit)
checkFatal(t, err)
if oid.Cmp(coid) != 0 {
t.Fatal("Hash and write Oids are different")