tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 10:48:37 +00:00
Code Releases Activity

Fix deleted branch isn't removed when push the branch again (#9516) (#9524)

Browse Source
This commit is contained in:
Lunny Xiao
2019-12-28 12:41:41 +08:00
committed by GitHub
parent a3928fd820
commit 9409ac9030
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/repofiles/update.go
View File

@@ -453,10 +453,15 @@ func PushUpdate(repo *models.Repository, branch string, opts models.PushUpdateOp
}
}
} else if !isDelRef {
branchName := opts.RefFullName[len(git.BranchPrefix):]
if err = models.RemoveDeletedBranch(repo.ID, branchName); err != nil {
log.Error("models.RemoveDeletedBranch %s/%s failed: %v", repo.ID, branchName, err)
}
// If is branch reference
// Clear cache for branch commit count
cache.Remove(repo.GetCommitsCountCacheKey(opts.RefFullName[len(git.BranchPrefix):], true))
cache.Remove(repo.GetCommitsCountCacheKey(branchName, true))
newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
if err != nil {