diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-12-28 12:41:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 12:41:41 +0800 |
| commit | 9409ac9030471de2aad798ec47cc463ddb7ee1ca (patch) | |
| tree | 6f76ad6eb06fb8ccd2ef278ad8bbbf35e029e62a /models | |
| parent | a3928fd82077f48b70321dacdad8eb96f1a9dd26 (diff) | |
| download | gitea-9409ac9030471de2aad798ec47cc463ddb7ee1ca.tar.gz gitea-9409ac9030471de2aad798ec47cc463ddb7ee1ca.zip | |
Fix deleted branch isn't removed when push the branch again (#9516) (#9524)
Diffstat (limited to 'models')
| -rw-r--r-- | models/branches.go | 6 |
1 files changed, 6 insertions, 0 deletions
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") |