fix: skip rebase in git/fetch when upstream branch no longer exists#682
Merged
Conversation
After git fetch --prune removes a stale remote tracking ref, an
unconditional git rebase fails with "fatal: invalid upstream" when the
current branch was tracking that deleted branch. Guard both rebase calls
with git rev-parse --verify '@{upstream}' so they are skipped (with an
info message) rather than causing a fatal error.
Closes #681
Prompt: hey, fetch needs fixing... → No pending changes in working folder. Rebasing...
fatal: invalid upstream 'refs/remotes/origin/feature/issue-408-optimise-project-checks'
✗ Could not rebase /home/markr/work/funfair/funfair-build-check
Owner
Super-linter summary
All files and directories linted successfully For more information, see the GitHub Actions workflow run Powered by Super-linter |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
git rebasecalls ingit/fetchwithgit rev-parse --verify '@{upstream}'before executinggit fetch --prune), emit an info message and skip the rebase instead of failing fatally--switch-to-mainrebase pathCloses #681