Skip to content

Commit 705b1e4

Browse files
guillep2klafriks
authored andcommitted
Don't attempt to close issue if already closed (#9696)
Co-authored-by: Lauris BH <[email protected]>
1 parent 438e159 commit 705b1e4

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

modules/repofiles/action.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,11 @@ func UpdateIssuesCommit(doer *models.User, repo *models.Repository, commits []*r
138138
continue
139139
}
140140
}
141-
142-
if err := changeIssueStatus(refRepo, refIssue, doer, ref.Action == references.XRefActionCloses); err != nil {
143-
return err
141+
close := (ref.Action == references.XRefActionCloses)
142+
if close != refIssue.IsClosed {
143+
if err := changeIssueStatus(refRepo, refIssue, doer, close); err != nil {
144+
return err
145+
}
144146
}
145147
}
146148
}

services/pull/merge.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,10 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
374374
return err
375375
}
376376
close := (ref.RefAction == references.XRefActionCloses)
377-
if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
378-
return err
377+
if close != ref.Issue.IsClosed {
378+
if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
379+
return err
380+
}
379381
}
380382
}
381383

0 commit comments

Comments
 (0)