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.

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

Add setting to disable the git apply step in test patch (#22130) #22170

Merged
merged 2 commits into from
Dec 22, 2022

Commits on Dec 19, 2022

  1. Add setting to disable the git apply step in test patch (go-gitea#22130)

    Backport go-gitea#22130
    
    For a long time Gitea has tested PR patches using a git apply --check
    method, and in fact prior to the introduction of a read-tree assisted
    three-way merge in go-gitea#18004, this was the only way of checking patches.
    
    Since go-gitea#18004, the git apply --check method has been a fallback method,
    only used when the read-tree three-way merge method has detected a
    conflict. The read-tree assisted three-way merge method is much faster
    and less resource intensive method of detecting conflicts. go-gitea#18004 kept
    the git apply method around because it was thought possible that this
    fallback might be able to rectify conflicts that the read-tree three-way
    merge detected. I am not certain if this could ever be the case.
    
    Given the uncertainty here and the now relative stability of the
    read-tree method - this PR makes using this fallback optional but
    enables it by default. A `log.Critical` has been added which will alert
    if the `git apply --check` method was successful at checking a PR that
    `read-tree` failed on.
    
    The hope is that none of these log.Critical messages will be found and
    there will be no significant difference in conflict detection. Thus we
    will be able to remove the git apply fallback in future, and/or improve
    the read-tree three-way merge method to catch any conflicts that git
    apply method might have been able to fix.
    
    An additional benefit for anyone who disables the check method is that
    patch checking should be significantly less resource intensive and much
    quicker.
    
    (See
    go-gitea#22083)
    
    Ref go-gitea#22083
    
    Signed-off-by: Andrew Thornton <art27@cantab.net>
    zeripath committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    8d2d8b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. Configuration menu
    Copy the full SHA
    14f02ff View commit details
    Browse the repository at this point in the history