Correctly handle moved files in apply patch (go-gitea#22118)

Backport go-gitea#22118 Moved files in a patch will result in git apply returning: ``` error: {filename}: No such file or directory ``` This wasn't handled by the git apply patch code. This PR adds handling for this. Fix go-gitea#22083 Signed-off-by: Andrew Thornton <[email protected]>
zeripath · Dec 14, 2022 · 2e5a983 · 2e5a983
1 parent 0e95e74
commit 2e5a983
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/services/pull/patch.go b/services/pull/patch.go
@@ -52,6 +52,8 @@ var patchErrorSuffices = []string{
 	": patch does not apply",
 	": already exists in working directory",
 	"unrecognized input",
+	": No such file or directory",
+	": does not exist in index",
 }
 
 // TestPatch will test whether a simple patch will apply
@@ -415,6 +417,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
 				scanner := bufio.NewScanner(stderrReader)
 				for scanner.Scan() {
 					line := scanner.Text()
+					log.Trace("PullRequest[%d].testPatch: stderr: %s", pr.ID, line)
 					if strings.HasPrefix(line, prefix) {
 						conflict = true
 						filepath := strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0])