some adjustments

Author: lunny

routers/private/hook_post_receive.go

@@ -172,7 +172,6 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
 
 	isPrivate := opts.GitPushOptions.Bool(private.GitPushOptionRepoPrivate)
 	isTemplate := opts.GitPushOptions.Bool(private.GitPushOptionRepoTemplate)
-
 	// Handle Push Options
 	if isPrivate.Has() || isTemplate.Has() {
 		// load the repository

services/pull/merge.go

@@ -177,7 +177,7 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
 		go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
 	}()
 
-	pr.MergedCommitID, err = doMergeAndPush(ctx, pr, doer, mergeStyle, expectedHeadCommitID, message, true)
+	_, err = doMergeAndPush(ctx, pr, doer, mergeStyle, expectedHeadCommitID, message, true)
 	if err != nil {
 		return err
 	}