1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-22 08:42:32 -05:00
forgejo/services/pull
zeripath 721e422fa7
Correctly handle moved files in apply patch (#22118) (#22136)
Backport #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 #22083

Signed-off-by: Andrew Thornton <art27@cantab.net>

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
2022-12-15 10:28:05 -05:00
..
check.go Fix checks in PR for empty commits (#20290) (#20352) 2022-07-13 18:36:23 +01:00
check_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
commit_status.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
edits.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
lfs.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
merge.go Do DB update after merge in hammer context (#21401) (#21416) 2022-10-12 15:52:21 +08:00
patch.go Correctly handle moved files in apply patch (#22118) (#22136) 2022-12-15 10:28:05 -05:00
patch_unmerged.go Ensure that all unmerged files are merged when conflict checking (#20528) (#20536) 2022-07-29 15:37:18 +02:00
pull.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
pull_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
review.go Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407) 2022-07-19 17:46:33 +02:00
temp_repo.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
update.go Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848) 2022-08-18 14:55:34 -04:00