Some improvement

Author: lunny

models/git/branch_test.go

@@ -30,17 +30,15 @@ func TestAddDeletedBranch(t *testing.T) {
 	assert.True(t, secondBranch.IsDeleted)
 
 	objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName)
-	objectID, err := objectFormat.NewIDFromString(secondBranch.CommitID)
-	assert.NoError(t, err)
 	commit := &git.Commit{
-		ID:            objectID,
+		ID:            git.MustIDFromString(objectFormat, secondBranch.CommitID),
 		CommitMessage: secondBranch.CommitMessage,
 		Committer: &git.Signature{
 			When: secondBranch.CommitTime.AsLocalTime(),
 		},
 	}
 
-	_, err = git_model.UpdateBranch(db.DefaultContext, repo.ID, secondBranch.PusherID, secondBranch.Name, commit)
+	_, err := git_model.UpdateBranch(db.DefaultContext, repo.ID, secondBranch.PusherID, secondBranch.Name, commit)
 	assert.NoError(t, err)
 }
 

modules/git/commit_info_nogogit.go

@@ -153,11 +153,7 @@ func GetLastCommitForPaths(ctx context.Context, commit *Commit, treePath string,
 		if typ != "commit" {
 			return nil, fmt.Errorf("unexpected type: %s for commit id: %s", typ, commitID)
 		}
-		objectID, err := commit.ID.Type().NewIDFromString(commitID)
-		if err != nil {
-			return nil, err
-		}
-		c, err = CommitFromReader(commit.repo, objectID, io.LimitReader(batchReader, size))
+		c, err = CommitFromReader(commit.repo, commit.ID, io.LimitReader(batchReader, size))
 		if err != nil {
 			return nil, err
 		}

modules/git/commit_reader.go

@@ -71,11 +71,11 @@ readLoop:
 
 			switch string(split[0]) {
 			case "tree":
-				newObjectID, err := objectID.Type().NewIDFromString(string(data))
+				treeObjectID, err := objectID.Type().NewIDFromString(string(data))
 				if err != nil {
 					return nil, err
 				}
-				commit.Tree = *NewTree(gitRepo, newObjectID)
+				commit.Tree = *NewTree(gitRepo, treeObjectID)
 				_, _ = payloadSB.Write(line)
 			case "parent":
 				parentObjectID, err := objectID.Type().NewIDFromString(string(data))