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

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Correctly handle moved files in apply patch #22118

merged 7 commits into from
Dec 14, 2022

Commits on Dec 13, 2022

  1. Correctly handle moved files in apply patch 

    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 13, 2022
    Configuration menu
    Copy the full SHA
    494a122 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix-22083-detect-no-such-file

    @techknowlogick
    techknowlogick committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    ffe611f View commit details
    Browse the repository at this point in the history

  3. Add trace logging for stderr in check patch 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    5f2d39c View commit details
    Browse the repository at this point in the history

  4. And handle "does not exist in index" 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    f686bd4 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Merge branch 'main' into fix-22083-detect-no-such-file

    @techknowlogick
    techknowlogick committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    27aeb34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix-22083-detect-no-such-file

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

  3. Merge branch 'main' into fix-22083-detect-no-such-file

    @zeripath
    zeripath committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    2f60518 View commit details
    Browse the repository at this point in the history