fix: Incorrect warning about commits #395
Merged
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
harrisoncramer
commented
Oct 11, 2024
3 tasks
Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
harrisoncramer
added a commit
that referenced
this pull request
Oct 13, 2024
fix: Error messages and run all tests (#381) feat: Automatically open fold under cursor (#380) fix: Discussion ID is not required (#383) chore: Add more emojis (#384) fix: Publish all drafts (#391) fix: Make discussion tree buffers no-modifiable (#394) fix: Incorrect warning about commits (#395) fix: Show draft replies in the correct tree (#396) fix: Cannot choose merge requests (#398) --------- Co-authored-by: George Kontridze <george.kontridze@gmail.com> Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
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.
This MR updates the function that checks the stability of the branch and MR.
There is now one function responsible for checking whether the current branch is ahead/behind it's tracking branch. That function will warn the user if that's the case for all three possibilites (ahead, behind, or ahead and behind).
The second function is responsible for alerting the user if the status of the current MR is bad: merged, closed, or with conflicts.
These should address the points outlined in the issue outlined by Jakub. For instance, in the complex case where the user is setup to track a remote and they are behind the remote, and the MR associated with that remote has already been closed, they will get both warnings, which is accurate.
Plesae @jakubbortlik give this a look when you have time. Thanks.