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

Jump to bottom

Correctly handle moved files in apply patch (#22118) #22136

Merged
merged 2 commits into from
Dec 15, 2022
Merged

Correctly handle moved files in apply patch (#22118) #22136

merged 2 commits into from
Dec 15, 2022

Commits on Dec 14, 2022

  1. 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 <art27@cantab.net>
    @zeripath
    zeripath committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    2e5a983 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/v1.17' into backport-22118-v1.17

    @KN4CK3R
    KN4CK3R committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    708b78e View commit details
    Browse the repository at this point in the history