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

Speed up conflict checking in pull request creation #276

Merged
merged 3 commits into from
Dec 29, 2016
Merged

Speed up conflict checking in pull request creation #276

merged 3 commits into from
Dec 29, 2016

Commits on Dec 29, 2016

  1. Speed up conflict checking in pull request creation 

    In order to check conflicts of a PR, we set up a working tree by
cloning the base branch, which is quite time-consuming when the repository is huge.
Instead, this PR uses `git read-tree` and `git apply --check --cached` to check conflicts.

For go-gitea#258
    @typeless
    typeless committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    c39e0b3 View commit details
    Browse the repository at this point in the history

  2. Use $GIT_INDEX_FILE instead of --index-output to avoid lockfile problem 

    The lockfile gets renamed to the final destination after the operation
finishes. But it must be located in the same filesystem, which prevents
us from using /tmp.
    @typeless
    typeless committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    f349204 View commit details
    Browse the repository at this point in the history

  3. Temporary file names should not prefixed with '-'

    @typeless
    typeless committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    f635203 View commit details
    Browse the repository at this point in the history