Merge pull request #432 from josharian/simplify-oid

carlosmn · lhchavez · commit c9f422f4ed2e · 2020-08-15T12:17:57.000-07:00
git: simplify some Oid methods (cherry picked from commit c740e1d)
diff --git a/git.go b/git.go
@@ -189,22 +189,16 @@ func (oid *Oid) Cmp(oid2 *Oid) int {
 }
 
 func (oid *Oid) Copy() *Oid {
-	ret := new(Oid)
-	copy(ret[:], oid[:])
-	return ret
+	ret := *oid
+	return &ret
 }
 
 func (oid *Oid) Equal(oid2 *Oid) bool {
-	return bytes.Equal(oid[:], oid2[:])
+	return *oid == *oid2
 }
 
 func (oid *Oid) IsZero() bool {
-	for _, a := range oid {
-		if a != 0 {
-			return false
-		}
-	}
-	return true
+	return *oid == Oid{}
 }
 
 func (oid *Oid) NCmp(oid2 *Oid, n uint) int {

Original file line number	Diff line number	Diff line change
`@@ -189,22 +189,16 @@ func (oid Oid) Cmp(oid2 Oid) int {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`func (oid Oid) Copy() Oid {`
`192`		`- ret := new(Oid)`
`193`		`- copy(ret[:], oid[:])`
`194`		`- return ret`
	`192`	`+ ret := *oid`
	`193`	`+ return &ret`
`195`	`194`	`}`
`196`	`195`
`197`	`196`	`func (oid Oid) Equal(oid2 Oid) bool {`
`198`		`- return bytes.Equal(oid[:], oid2[:])`
	`197`	`+ return oid == oid2`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`func (oid *Oid) IsZero() bool {`
`202`		`- for _, a := range oid {`
`203`		`- if a != 0 {`
`204`		`- return false`
`205`		`- }`
`206`		`- }`
`207`		`- return true`
	`201`	`+ return *oid == Oid{}`
`208`	`202`	`}`
`209`	`203`
`210`	`204`	`func (oid Oid) NCmp(oid2 Oid, n uint) int {`