Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly handle moved files in apply patch #22118

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Correctly handle moved files in apply patch #22118

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
494a122
Correctly handle moved files in apply patch
zeripath Dec 13, 2022
ffe611f
Merge branch 'main' into fix-22083-detect-no-such-file
techknowlogick Dec 13, 2022
5f2d39c
Add trace logging for stderr in check patch
zeripath Dec 13, 2022
f686bd4
And handle "does not exist in index"
zeripath Dec 13, 2022
27aeb34
Merge branch 'main' into fix-22083-detect-no-such-file
techknowlogick Dec 14, 2022
c9ee0a5
Merge branch 'main' into fix-22083-detect-no-such-file
techknowlogick Dec 14, 2022
2f60518
Merge branch 'main' into fix-22083-detect-no-such-file
zeripath Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions services/pull/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,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
Expand Down Expand Up @@ -416,6 +418,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])
Expand Down