Fix test

Author: lunny

modules/git/object_format.go

@@ -5,13 +5,13 @@ package git
 
 import (
 	"crypto/sha1"
+	"encoding/hex"
+	"fmt"
 	"regexp"
 	"strconv"
+	"strings"
 )
 
-// sha1Pattern can be used to determine if a string is an valid sha
-var sha1Pattern = regexp.MustCompile(`^[0-9a-f]{4,40}$`)
-
 type ObjectFormat interface {
 	// Name returns the name of the object format
 	Name() string
@@ -31,29 +31,36 @@ type ObjectFormat interface {
 
 type Sha1ObjectFormatImpl struct{}
 
-var (
-	emptyObjectID = &Sha1Hash{}
-	emptyTree     = &Sha1Hash{
-		0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60,
-		0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04,
-	}
-)
-
 func (Sha1ObjectFormatImpl) Name() string { return "sha1" }
 func (Sha1ObjectFormatImpl) EmptyObjectID() ObjectID {
-	return emptyObjectID
+	return &Sha1Hash{}
 }
 
 func (Sha1ObjectFormatImpl) EmptyTree() ObjectID {
-	return emptyTree
+	return &Sha1Hash{
+		0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60,
+		0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04,
+	}
 }
 func (Sha1ObjectFormatImpl) FullLength() int { return 40 }
+
+// sha1Pattern can be used to determine if a string is an valid sha
+var sha1Pattern = regexp.MustCompile(`^[0-9a-f]{4,40}$`)
+
 func (Sha1ObjectFormatImpl) IsValid(objIDStr string) bool {
 	return sha1Pattern.MatchString(objIDStr)
 }
 
 func (h Sha1ObjectFormatImpl) NewIDFromString(objIDStr string) (ObjectID, error) {
-	return genericIDFromString(h, objIDStr)
+	objIDStr = strings.TrimSpace(objIDStr)
+	if len(objIDStr) != h.FullLength() {
+		return h.EmptyObjectID(), fmt.Errorf("length must be %d: %s", h.FullLength(), s)
+	}
+	b, err := hex.DecodeString(objIDStr)
+	if err != nil {
+		return h.EmptyObjectID(), err
+	}
+	return IDFromRaw(h, b)
 }
 
 // ComputeHash compute the hash for a given ObjectType and content

modules/git/object_id.go

@@ -8,7 +8,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"strings"
 )
 
 type ObjectID interface {
@@ -69,18 +68,6 @@ func MustIDFromString(h ObjectFormat, s string) ObjectID {
 	return MustID(h, b)
 }
 
-func genericIDFromString(h ObjectFormat, s string) (ObjectID, error) {
-	s = strings.TrimSpace(s)
-	if len(s) != h.FullLength() {
-		return h.EmptyObjectID(), fmt.Errorf("length must be %d: %s", h.FullLength(), s)
-	}
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		return h.EmptyObjectID(), err
-	}
-	return IDFromRaw(h, b)
-}
-
 func IDFromString(hexHash string) (ObjectID, error) {
 	for _, objectFormat := range SupportedObjectFormats {
 		if len(hexHash) == objectFormat.FullLength() {

services/repository/files/update.go

@@ -143,6 +143,7 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 	t, err := NewTemporaryUploadRepository(ctx, repo)
 	if err != nil {
 		log.Error("%v", err)
+		return nil, err
 	}
 	defer t.Close()
 	hasOldBranch := true

services/repository/fork.go

@@ -76,17 +76,18 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 		defaultBranch = opts.SingleBranch
 	}
 	repo := &repo_model.Repository{
-		OwnerID:       owner.ID,
-		Owner:         owner,
-		OwnerName:     owner.Name,
-		Name:          opts.Name,
-		LowerName:     strings.ToLower(opts.Name),
-		Description:   opts.Description,
-		DefaultBranch: defaultBranch,
-		IsPrivate:     opts.BaseRepo.IsPrivate || opts.BaseRepo.Owner.Visibility == structs.VisibleTypePrivate,
-		IsEmpty:       opts.BaseRepo.IsEmpty,
-		IsFork:        true,
-		ForkID:        opts.BaseRepo.ID,
+		OwnerID:          owner.ID,
+		Owner:            owner,
+		OwnerName:        owner.Name,
+		Name:             opts.Name,
+		LowerName:        strings.ToLower(opts.Name),
+		Description:      opts.Description,
+		DefaultBranch:    defaultBranch,
+		IsPrivate:        opts.BaseRepo.IsPrivate || opts.BaseRepo.Owner.Visibility == structs.VisibleTypePrivate,
+		IsEmpty:          opts.BaseRepo.IsEmpty,
+		IsFork:           true,
+		ForkID:           opts.BaseRepo.ID,
+		ObjectFormatName: opts.BaseRepo.ObjectFormatName,
 	}
 
 	oldRepoPath := opts.BaseRepo.RepoPath()