git: Don't reset last active branch to wrong commit #5919
Merged
Conversation
This file contains 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
|
cc @tardyp Could you take a look? This is one of the more risky changes that may have a significant impact if we get it wrong. |
Codecov Report
@@ Coverage Diff @@
## master #5919 +/- ##
=======================================
Coverage 91.68% 91.68%
=======================================
Files 339 339
Lines 36260 36260
=======================================
Hits 33246 33246
Misses 3014 3014
Continue to review full report at Codecov.
|
When we change the checked out code using `git reset --hard <rev>` we also change the revision that the currently active branch points to. This leads to that branch pointing to a wrong commit as we're actually checking out a different branch (we switch to it just a little bit later). Instead of modifying the current branch we should just modify the working copy, which can be done by `git checkout -f <rev>`.
p12tic
force-pushed
the
git-dont-reset-branch-to-wrong-commit
branch
from
44e14d6
to
bd37daa
Compare
tardyp
approved these changes
Mar 19, 2021
|
good finding! |
|
merging, to ease review of #5929 |
leoetlino
added a commit
to dolphin-emu/sadm
that referenced
this pull request
Oct 3, 2021
Fixes release builds showing HEAD as the branch name now that [Buildbot doesn't `git reset --hard` the active branch anymore](buildbot/buildbot#5919).
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.
When we change the checked out code using
git reset --hard <rev>we also change the revision that the currently active branch points to. This leads to that branch pointing to a wrong commit as we're actually checking out a different branch (we switch to it just a little bit later). Instead of modifying the current branch we should just modify the working copy, which can be done bygit checkout -f <rev>.We need branches to point to correct commits in order for
GitDiffInfostep to work.git checkout -f documentation:
I've tested how
git checkout -fworks just to be sure and it's equivalent togit reset --hardexcept that active branch is not affected. I've also tested a real Buildbot installation with the change.