Fix yellow/red coloring of pushed/unpushed commits in branch commits panel #2448
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
Uffizzi Preview Environment☁️ https://app.uffizzi.com/github.com/jesseduffield/lazygit/pull/2448 ⚙️ Updating now by workflow run 4211348134. What is Uffizzi? Learn more |
The test shows that we are using "refs/heads/mybranch"@{u} in the git merge-base
call that tries to determine the first pushed commit. This doesn't work, the
@{u} suffix only works with short ref names. We'll fix this in the next commit.
…panel
The detection of the first pushed commit (commits above this are colored red,
below this yellow) didn't work for the sub-commits view of the branches panel.
The reason is that we were calling
git merge-base refs/heads/mybranch refs/heads/mybranch@{u}
to detect the merge base; this doesn't work, the @{u} prefix only works for
short ref names, not full refs. So change the call to
git merge-base refs/heads/mybranch mybranch@{u}
stefanhaller
force-pushed
the
fix-getFirstPushedCommit-in-branches-panel
branch
from
7b40d20 to
401d3f4
Compare
|
Nice work! I had no idea this would be such a simple change. I'm gonna squash+merge cos the test may as well live in the same commit as the code it's testing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The detection of the first pushed commit (commits above this are colored red,
below this yellow) didn't work for the sub-commits view of the branches panel.
In the following picture, the coloring is correct for the local commits panel,
but not for the branches panel when showing the same branch. This PR fixes that.
go run scripts/cheatsheet/main.go generate)docs/Config.md) have been updated if necessary