From 0bcf644da4c3d21fad3ce8f33ccc26f8110568d6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 Dec 2019 03:17:37 +0800 Subject: Fix deleted branch isn't removed when push the branch again (#9516) --- models/branches.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'models') diff --git a/models/branches.go b/models/branches.go index 045019314a..21b23c75d9 100644 --- a/models/branches.go +++ b/models/branches.go @@ -525,6 +525,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(ctx context.Context) { // Nothing to do for shutdown or terminate -- cgit v1.2.3