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

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

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

Conversation

arxanas
Copy link
Owner

@arxanas arxanas commented Jul 6, 2024

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

@arxanas arxanas force-pushed the arxanas/feat-sync-when-pull-is-passed-fetch-only-from-the-main-branch-remote-instead-of-all-remotes branch from 7023260 to 0062828 Compare August 9, 2024 01:37
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.
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 force-pushed the arxanas/feat-sync-when-pull-is-passed-fetch-only-from-the-main-branch-remote-instead-of-all-remotes branch from 0062828 to bbe63fb Compare December 2, 2024 20:53
@arxanas arxanas enabled auto-merge (rebase) December 2, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant