BackgroundFetch & push --force-with-lease : add a warning message #8533
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
Codecov Report
@@ Coverage Diff @@
## master #8533 +/- ##
==========================================
- Coverage 55.59% 55.10% -0.49%
==========================================
Files 888 899 +11
Lines 64110 64776 +666
Branches 11467 11629 +162
==========================================
+ Hits 35640 35694 +54
- Misses 25766 26344 +578
- Partials 2704 2738 +34
Flags with carried forward coverage won't be shown. Click here to find out more. |
RussKie
reviewed
Oct 10, 2020
| { | ||
| tb.Multiline = true; | ||
| tb.Height = 500; | ||
| }); |
There was a problem hiding this comment.
Yes. That's handled by PseudoSetting.
RussKie
reviewed
Oct 10, 2020
| @@ -25,6 +25,11 @@ public BackgroundFetchPlugin() : base(true) | |||
| private IDisposable _cancellationToken; | |||
| private IGitUICommands _currentGitUiCommands; | |||
|
|
|||
| private readonly PseudoSetting _warningForceWithLease = new PseudoSetting("Warning: be aware that the push force with lease feature should be used carefully when the periodic background fetch is enabled. Indeed, the protection brought by this feature could be bypassed if the background fetch has updated the remote branches. And you could loose the commits newly pushed by someone else. So be sure to refresh the revsion grid before doing a force push with lease.", textboxSettings: tb => | |||
There was a problem hiding this comment.
Few typos in the original text.
The text looks a bit verbose, what do you think of this variant?
Suggested change
| private readonly PseudoSetting _warningForceWithLease = new PseudoSetting("Warning: be aware that the push force with lease feature should be used carefully when the periodic background fetch is enabled. Indeed, the protection brought by this feature could be bypassed if the background fetch has updated the remote branches. And you could loose the commits newly pushed by someone else. So be sure to refresh the revsion grid before doing a force push with lease.", textboxSettings: tb => | |
| private readonly PseudoSetting _warningForceWithLease = new PseudoSetting("WARNING: be careful when force push with lease having the periodic background fetch enabled but chose not to auto-refresh after each fetch. You could lose new commits pushed by others to the remote branch. Be sure to refresh the revision grid before doing a force push with lease.", textboxSettings: tb => |
RussKie
added
📭 needs: author feedback
ghost
removed
the
📭 needs: author feedback
for when using the "git push --force-with-lease" feature
pmiossec
force-pushed
the
warning_bckg_fetch_force_with_lease
branch
from
f2a1102
to
f8f0265
Compare
RussKie
approved these changes
Oct 12, 2020
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.
Proposed changes
about some risk when using the "git push --force-with-lease" feature
Screenshots
Before
no warning message.
After
Test methodology
Test environment(s)