From a6d4a8546a772ede0f59317eb51b9a90370cb67b Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 17 Dec 2021 14:24:47 +0800
Subject: [PATCH] Fix rename notification bug (#18008)

---
 modules/notification/action/action.go | 2 --
 services/repository/transfer.go       | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go
index 376c5d103b..88395d929a 100644
--- a/modules/notification/action/action.go
+++ b/modules/notification/action/action.go
@@ -152,8 +152,6 @@ func (a *actionNotifier) NotifyNewPullRequest(pull *models.PullRequest, mentions
 }
 
 func (a *actionNotifier) NotifyRenameRepository(doer *user_model.User, repo *repo_model.Repository, oldRepoName string) {
-	log.Trace("action.ChangeRepositoryName: %s/%s", doer.Name, repo.Name)
-
 	if err := models.NotifyWatchers(&models.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
diff --git a/services/repository/transfer.go b/services/repository/transfer.go
index 83cac401d6..1e8b78dfc6 100644
--- a/services/repository/transfer.go
+++ b/services/repository/transfer.go
@@ -12,6 +12,7 @@ import (
 	"code.gitea.io/gitea/models/perm"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/sync"
 )
@@ -57,6 +58,8 @@ func TransferOwnership(doer, newOwner *user_model.User, repo *repo_model.Reposit
 
 // ChangeRepositoryName changes all corresponding setting from old repository name to new one.
 func ChangeRepositoryName(doer *user_model.User, repo *repo_model.Repository, newRepoName string) error {
+	log.Trace("ChangeRepositoryName: %s/%s -> %s", doer.Name, repo.Name, newRepoName)
+
 	oldRepoName := repo.Name
 
 	// Change repository directory name. We must lock the local copy of the
@@ -70,6 +73,7 @@ func ChangeRepositoryName(doer *user_model.User, repo *repo_model.Repository, ne
 	}
 	repoWorkingPool.CheckOut(fmt.Sprint(repo.ID))
 
+	repo.Name = newRepoName
 	notification.NotifyRenameRepository(doer, repo, oldRepoName)
 
 	return nil