Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push multiple: Set default push to false #8515

Merged

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Oct 3, 2020

Fixes #4421

Proposed changes

  • Set push to default for multiple branches
  • Change column name Push (Force Rewind) to Force (The tickbox is either Push or Force, but I believe just Force is clear enough)

No implementation of ticking multiple branches

Screenshots

Before

image

After

image

Test methodology

Manual


✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned gerhardol Oct 3, 2020
@codecov
Copy link

codecov bot commented Oct 3, 2020

Codecov Report

Merging #8515 into master will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #8515      +/-   ##
==========================================
- Coverage   55.21%   55.19%   -0.02%     
==========================================
  Files         900      900              
  Lines       64563    64563              
  Branches    11553    11553              
==========================================
- Hits        35646    35638       -8     
- Misses      26194    26195       +1     
- Partials     2723     2730       +7     
Flag Coverage Δ
#production 42.10% <0.00%> (-0.02%) ⬇️
#tests 94.78% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@pmiossec
Copy link
Member

pmiossec commented Oct 3, 2020 via email

@gerhardol
Copy link
Member Author

I have made also something to improve the push multiple selection. I will create a PR with my changes so that we are able to discuss... It allows to unselect all, select all or select only tracked remotes.

Good, I will close this PR (draft fornow)

@gerhardol gerhardol marked this pull request as draft October 3, 2020 22:40
@pmiossec
Copy link
Member

pmiossec commented Oct 4, 2020

Good, I will close this PR (draft fornow)

This PR is not incompatible with mine.
I did mine because I didn't want to change this default even if I'm also convinced that it is a better one.

So you can merge it.

@gerhardol
Copy link
Member Author

I did mine because I didn't want to change this default even if I'm also convinced that it is a better one.

It should be OK to change the defaults, this is how I expect this to be useful

But if someone uses "all set by default" to make a backup or something it is nice if there is a "select all with remote tracking".
But if you have a change prepared, it is good to add this.

@gerhardol gerhardol marked this pull request as ready for review October 4, 2020 11:55
@gerhardol
Copy link
Member Author

@msftbot merge in 33 hours

@ghost ghost added the status: auto merge label Oct 4, 2020
@ghost
Copy link

ghost commented Oct 4, 2020

Hello @gerhardol!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Mon, 05 Oct 2020 20:56:34 GMT, which is in 1 day and 9 hours

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@RussKie RussKie merged commit e1b3b01 into gitextensions:master Oct 4, 2020
@ghost ghost added this to the 4.0 milestone Oct 4, 2020
@gerhardol gerhardol deleted the feature/multiple-push-default-false branch October 4, 2020 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Push multiple branches: check all and uncheck all required feature
3 participants