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

feat(sync): when --pull is passed, fetch only from the main branch remote, instead of all remotes #1364

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

feat(sync): when --pull is passed, fetch only from the main branch remote, instead of all remotes #1364

wants to merge 7 commits into from

Commits on Jul 7, 2024

  1. build: add rust-toolchain.toml 

    It seems easier for contributors to get started if the compiler version is already configured; plus, this will presumably make it so that I don't have to set the Rust version with `rustup override` whenever I create a new worktree.
    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    70c8b31 View commit details
    Browse the repository at this point in the history

  2. refactor(core): re-export formatting symbols from cursive_core 

    This should have been done from the beginning, since we operate on these symbols in several places for formatting. This would also help a migration away from `cursive`, since now only two modules have direct dependencies on `cursive`/`cursive_core`:

- git-branchless-lib for general output formatting.
- git-branchless-undo for the interactive undo UI.
    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    847c853 View commit details
    Browse the repository at this point in the history

  3. feat(submit:phabricator): do not abort entire process on failure 

    Currently, `git submit` for Phabricator will abort the entire operation if any commit fails to be submitted. This means that if `arc diff` succeeds on one commit and then fails on its child, the entire operation is aborted. However, the first `arc diff` had side effects, so the user gets diffs uploaded to Phabricator that are not reflected locally. Instead, we should confirm any passing commits and abort after we get a failing commit. This commit updates the Phabricator forge to handle the error case better and not produce garbage commits on Phabricator.
    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    829a121 View commit details
    Browse the repository at this point in the history

  4. feat(test): report PrepareWorkingDirectoryError reason

    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    0552f9c View commit details
    Browse the repository at this point in the history

  5. docs(test): add FIXMEs detailing problems with git test run worktre… 

    …e management
    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    5cd489e View commit details
    Browse the repository at this point in the history

  6. refactor(sync): extract pull_main_branch function

    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    a3b85cd View commit details
    Browse the repository at this point in the history

  7. feat(sync): when --pull is passed, fetch only from the main branch … 

    …remote, instead of all remotes
    @arxanas
    arxanas committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    0062828 View commit details
    Browse the repository at this point in the history