Skip to content

Commit 3c71163

Browse files
lunnybkcsoft
authored andcommitted
change the default action when deleting a release to not delete tag
1 parent 727675d commit 3c71163

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

models/release.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func UpdateRelease(gitRepo *git.Repository, rel *Release) (err error) {
249249
}
250250

251251
// DeleteReleaseByID deletes a release and corresponding Git tag by given ID.
252-
func DeleteReleaseByID(id int64, u *User) error {
252+
func DeleteReleaseByID(id int64, u *User, delTag bool) error {
253253
rel, err := GetReleaseByID(id)
254254
if err != nil {
255255
return fmt.Errorf("GetReleaseByID: %v", err)
@@ -267,11 +267,13 @@ func DeleteReleaseByID(id int64, u *User) error {
267267
return fmt.Errorf("DeleteReleaseByID: permission denied")
268268
}
269269

270-
_, stderr, err := process.ExecDir(-1, repo.RepoPath(),
271-
fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID),
272-
"git", "tag", "-d", rel.TagName)
273-
if err != nil && !strings.Contains(stderr, "not found") {
274-
return fmt.Errorf("git tag -d: %v - %s", err, stderr)
270+
if delTag {
271+
_, stderr, err := process.ExecDir(-1, repo.RepoPath(),
272+
fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID),
273+
"git", "tag", "-d", rel.TagName)
274+
if err != nil && !strings.Contains(stderr, "not found") {
275+
return fmt.Errorf("git tag -d: %v - %s", err, stderr)
276+
}
275277
}
276278

277279
if _, err = x.Id(rel.ID).Delete(new(Release)); err != nil {

routers/repo/release.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
304304

305305
// DeleteRelease delete a release
306306
func DeleteRelease(ctx *context.Context) {
307-
if err := models.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User); err != nil {
307+
delTag := ctx.QueryBool("delTag")
308+
if err := models.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User, delTag); err != nil {
308309
ctx.Flash.Error("DeleteReleaseByID: " + err.Error())
309310
} else {
310311
ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))

0 commit comments

Comments
 (0)