Revert "git: don't show incorrect notification about "local changes not restored""

This reverts commit ef22124

This is just a follow-up reverted with the main revert of 9d9c015
This commit is contained in:
Kirill Likhodedov
2018-05-29 21:19:16 +03:00
parent 5d77379fd3
commit 0e0a4e003e
2 changed files with 2 additions and 10 deletions
@@ -241,11 +241,7 @@ public class GitUpdateProcess {
notifyImportantError(myProject, "Error updating " + rootName,
"Updating " + rootName + " failed with an error: " + e.getLocalizedMessage());
}
}) {
protected boolean shouldNotifyLocalChangesAreNotRestored() {
return unstashAfterUpdate();
}
};
});
myPreservingProcess.execute(() -> {
if (!unstashAfterUpdate()) return false;
@@ -100,7 +100,7 @@ public class GitPreservingProcess {
LOG.debug("loading");
load();
}
else if (shouldNotifyLocalChangesAreNotRestored()) {
else {
mySaver.notifyLocalChangesAreNotRestored();
}
}
@@ -111,10 +111,6 @@ public class GitPreservingProcess {
new GitFreezingProcess(myProject, myOperationTitle, operation).execute();
}
protected boolean shouldNotifyLocalChangesAreNotRestored() {
return true;
}
/**
* Configures the saver: i.e. notifications and texts for the GitConflictResolver used inside.
*/