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

Add support for worktrees #1119

Merged
merged 6 commits into from
Feb 9, 2022
Merged

Add support for worktrees #1119

merged 6 commits into from
Feb 9, 2022

Commits on Feb 4, 2022

  1. Add support for worktrees 

    Git supports using the same local repository for multiple checked-out worktrees. JGit does not fully support this, so we have to do some workarounds for it to work.

The previous workaround provided by diffplug#965 did not take `commondir` into consideration, which is the location of a few files.
    @klaren
    klaren committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    c3a32ee View commit details
    Browse the repository at this point in the history

  2. Update changelog

    @klaren
    klaren committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    4b47e1c View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2022

  1. Fix spotbugs warning.

    @nedtwigg
    nedtwigg committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    6889321 View commit details
    Browse the repository at this point in the history

  2. Fix changelog merge conflicts.

    @nedtwigg
    nedtwigg committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    e4d025b View commit details
    Browse the repository at this point in the history

  3. Oops, fix the changelog entries.

    @nedtwigg
    nedtwigg committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    27d1645 View commit details
    Browse the repository at this point in the history

  4. Double the Gradle metaspace to help with flaky CI.

    @nedtwigg
    nedtwigg committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    6a03212 View commit details
    Browse the repository at this point in the history