utils/update-checkout: Do any git checkout before the git fetch.
#7165
Conversation
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
erg
force-pushed
the
fix-update-checkout-fetch
branch
2 times, most recently
from
49a6634 to
3e6d7c3
Compare
|
@swift-ci Please smoke test |
erg
force-pushed
the
fix-update-checkout-fetch
branch
2 times, most recently
from
bfdc39b to
7e865fd
Compare
|
@swift-ci Please smoke test |
utils/update-checkout: Add a call to ``git rebase --abort`` when using the ``--clean`` option. Calling ``git fetch`` updates .git/FETCH_HEAD and marks all branches besides the currently checked out branch as not-for-merge. So tot ensure that the branch we want to merge is available for merging, we must do a checkout of that branch before updating the FETCH_HEAD file. We also must ensure that we have fetched before optionally resetting to remote. Fixes https://bugs.swift.org/browse/SR-3800. The --clean option is meant to restore your repository to a pristine condition, but there are cases where you can ``reset --hard`` and still be in the middle of a rebase. This is annoying across 10+ repositories, so if the user wants to --clean, then abort all rebases in progress.
erg
force-pushed
the
fix-update-checkout-fetch
branch
from
7e865fd to
07ddf07
Compare
|
@swift-ci Please smoke test |
AnthonyLatsis
added
the
update-checkout
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Calling
git fetchupdates .git/FETCH_HEAD and marks all branchesbesides the currently checked out branch as not-for-merge. So to
ensure that the branch we want to merge is available for merging, we
must do a checkout of that branch before updating the FETCH_HEAD file.
Fixes #46385.