matthiasblaesing commented on code in PR #6823:
URL: https://github.com/apache/netbeans/pull/6823#discussion_r1436055219
##########
ide/git/src/org/netbeans/modules/git/ui/push/PushWizard.java:
##########
@@ -169,7 +169,7 @@ public synchronized void nextPanel () {
Collection<PushMapping> mappings =
pushBranchesStep.getSelectedMappings();
Map<String, String> remoteBranches = new LinkedHashMap<String,
String>(mappings.size());
for (PushMapping mapping : mappings) {
- if (!mapping.isDeletion() && mapping instanceof
PushMapping.PushBranchMapping) {
+ if ((!mapping.isDestructive() || mapping.getLocalName() !=
null) && mapping instanceof PushMapping.PushBranchMapping) {
Review Comment:
Ok, I finally managed to reproduce it. After a push the `<remote>/<branch>`
branches are updated to the repository state. After a force push this update is
also destructive for that mirror branch. This case could not happen before,
because the push would have been rejected and thus there would be nothing to
pull.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
