From 9409ac9030471de2aad798ec47cc463ddb7ee1ca Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 Dec 2019 12:41:41 +0800 Subject: Fix deleted branch isn't removed when push the branch again (#9516) (#9524) --- models/branches.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'models') diff --git a/models/branches.go b/models/branches.go index fa8beb866c..3d55cbacd8 100644 --- a/models/branches.go +++ b/models/branches.go @@ -480,6 +480,12 @@ func (deletedBranch *DeletedBranch) LoadUser() { deletedBranch.DeletedBy = user } +// RemoveDeletedBranch removes all deleted branches +func RemoveDeletedBranch(repoID int64, branch string) error { + _, err := x.Where("repo_id=? AND name=?", repoID, branch).Delete(new(DeletedBranch)) + return err +} + // RemoveOldDeletedBranches removes old deleted branches func RemoveOldDeletedBranches() { log.Trace("Doing: DeletedBranchesCleanup") -- cgit v1.2.3