fix: Pull dialog not remember user selection #6615
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
If "Open Pull dialog ..." is set as a default pull operation, the pull dialog does not have correct settings preselected upon open. Also since refactors in v3 pull dialog does not remember user selection (such as `Auto stash`). The fix restores `FormPullAction` setting that remembers user's selection in the dialog. The fix also restores the capture of `AutoStash` selection. Fixes gitextensions#6503 (cherry picked from commit 691c45b)
Codecov Report
@@ Coverage Diff @@
## release/3.1 #6615 +/- ##
==============================================
+ Coverage 47.07% 47.1% +0.03%
==============================================
Files 696 696
Lines 52401 52448 +47
Branches 6917 6923 +6
==============================================
+ Hits 24667 24707 +40
- Misses 26393 26395 +2
- Partials 1341 1346 +5
|
RussKie
deleted the
fix_6503_Pull_dialog_not_remember_user_selection_311
branch
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.
If "Open Pull dialog ..." is set as a default pull operation, the pull dialog does not have correct settings preselected upon open.
Also since refactors in v3 pull dialog does not remember user selection (such as
Auto stash).Fixes #6503
(cherry picked from commit 691c45b)
Proposed changes
FormPullActionsetting that remembers user's selection in the dialog.AutoStashselection.Screenshots
Before
After
Test methodology
Test environment(s)
✒️ I contribute this code under The Developer Certificate of Origin.