TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 16:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicated file on pull request conflicted files (#7211) (#7214)

Browse Source
This commit is contained in:
Lunny Xiao
2019-06-16 00:22:45 +08:00
committed by zeripath
parent 76e8eec3d9
commit 7697a282d6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
models/pull.go
View File

@@ -861,7 +861,17 @@ func (pr *PullRequest) testPatch(e Engine) (err error) {
line := scanner.Text() line := scanner.Text()
if strings.HasPrefix(line, prefix) { if strings.HasPrefix(line, prefix) {
pr.ConflictedFiles = append(pr.ConflictedFiles, strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0])) var found bool
var filepath = strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0])
for _, f := range pr.ConflictedFiles {
if f == filepath {
found = true
break
}
}
if !found {
pr.ConflictedFiles = append(pr.ConflictedFiles, filepath)
}
} }
// only list 10 conflicted files // only list 10 conflicted files
if len(pr.ConflictedFiles) >= 10 { if len(pr.ConflictedFiles) >= 10 {