Make SHA1 type alias for plumbing.Hash in go-git.

Signed-off-by: Filip Navara <[email protected]>

Author: filipnavara

modules/git/commit_info.go

@@ -32,7 +32,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
 	commitsInfo := make([][]interface{}, len(tes))
 	for i, entry := range tes {
 		commit := &Commit{
-			ID:            SHA1(revs[i].Hash),
+			ID:            revs[i].Hash,
 			CommitMessage: revs[i].Message,
 			Committer: &Signature{
 				When: revs[i].Committer.When,
@@ -55,18 +55,13 @@ func convertCommit(c *object.Commit) *Commit {
 		}
 	}
 
-	parents := make([]SHA1, len(c.ParentHashes))
-	for i, parentHash := range c.ParentHashes {
-		parents[i] = SHA1(parentHash)
-	}
-
 	return &Commit{
-		ID:            SHA1(c.Hash),
+		ID:            c.Hash,
 		CommitMessage: c.Message,
 		Committer:     &commiter,
 		Author:        &author,
 		Signature:     pgpSignaure,
-		parents:       parents,
+		parents:       c.ParentHashes,
 	}
 }
 

modules/git/repo_commit.go

@@ -58,7 +58,7 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) {
 	commit.repo = repo
 
 	if tree, err := gogitCommit.Tree(); err != nil {
-		commit.Tree.ID = SHA1(tree.Hash)
+		commit.Tree.ID = tree.Hash
 		commit.Tree.gogitTree = tree
 	}
 

modules/git/sha1.go

@@ -5,7 +5,6 @@
 package git
 
 import (
-	"bytes"
 	"encoding/hex"
 	"fmt"
 	"strings"
@@ -17,30 +16,7 @@ import (
 const EmptySHA = "0000000000000000000000000000000000000000"
 
 // SHA1 a git commit name
-type SHA1 plumbing.Hash
-
-// Equal returns true if s has the same SHA1 as caller.
-// Support 40-length-string, []byte, SHA1.
-func (id SHA1) Equal(s2 interface{}) bool {
-	switch v := s2.(type) {
-	case string:
-		if len(v) != 40 {
-			return false
-		}
-		return v == id.String()
-	case []byte:
-		return bytes.Equal(v, id[:])
-	case SHA1:
-		return v == id
-	default:
-		return false
-	}
-}
-
-// String returns string (hex) representation of the Oid.
-func (id SHA1) String() string {
-	return hex.EncodeToString(id[:])
-}
+type SHA1 = plumbing.Hash
 
 // MustID always creates a new SHA1 from a [20]byte array with no validation of input.
 func MustID(b []byte) SHA1 {

modules/git/tree.go

@@ -74,7 +74,7 @@ func (t *Tree) ListEntries() (Entries, error) {
 	entries := make([]*TreeEntry, len(t.gogitTree.Entries))
 	for i, entry := range t.gogitTree.Entries {
 		entries[i] = &TreeEntry{
-			ID:             SHA1(entry.Hash),
+			ID:             entry.Hash,
 			gogitTreeEntry: &t.gogitTree.Entries[i],
 			ptree:          t,
 		}