From 7697a282d613bb6c29d482817ec7c767bb720416 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 16 Jun 2019 00:22:45 +0800
Subject: [PATCH] fix duplicated file on pull request conflicted files (#7211)
(#7214)
---
models/pull.go | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/models/pull.go b/models/pull.go
index 35fbc41788..9c4ac4b2ae 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -861,7 +861,17 @@ func (pr *PullRequest) testPatch(e Engine) (err error) {
line := scanner.Text()
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
if len(pr.ConflictedFiles) >= 10 {