agh 40byte not 20byte sha

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/git/batch_reader.go

@@ -82,6 +82,7 @@ func CatFileBatch(repoPath string) (WriteCloserError, *bufio.Reader, func()) {
 // ReadBatchLine reads the header line from cat-file --batch
 // We expect:
 // <sha> SP <type> SP <size> LF
+// sha is a 40byte not 20byte here
 func ReadBatchLine(rd *bufio.Reader) (sha []byte, typ string, size int64, err error) {
 	sha, err = rd.ReadBytes(' ')
 	if err != nil {

modules/git/repo_commit_nogogit.go

@@ -118,7 +118,7 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) {
 
 // ConvertToSHA1 returns a Hash object from a potential ID string
 func (repo *Repository) ConvertToSHA1(commitID string) (SHA1, error) {
-	if len(commitID) == 40 {
+	if len(commitID) == 40 && SHAPattern.MatchString(commitID) {
 		sha1, err := NewIDFromString(commitID)
 		if err == nil {
 			return sha1, nil
@@ -139,5 +139,5 @@ func (repo *Repository) ConvertToSHA1(commitID string) (SHA1, error) {
 		return SHA1{}, err
 	}
 
-	return MustID(sha), nil
+	return MustIDFromString(string(sha)), nil
 }