diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index c966b5d8b725..0ee84718b5ff 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -1310,16 +1310,16 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
     doCommit(changeList, changes, false);
   }
 
-  private boolean doCommit(final LocalChangeList changeList, final List<Change> changes, final boolean synchronously) {
+  private void doCommit(final LocalChangeList changeList, final List<Change> changes, final boolean synchronously) {
     FileDocumentManager.getInstance().saveAllDocuments();
-    return new CommitHelper(myProject, changeList, changes, changeList.getName(),
-                            StringUtil.isEmpty(changeList.getComment()) ? changeList.getName() : changeList.getComment(), new ArrayList<>(),
-                            false, synchronously, FunctionUtil.nullConstant(), null, false, null).doCommit();
+    new CommitHelper(myProject, changeList, changes, changeList.getName(),
+                     StringUtil.isEmpty(changeList.getComment()) ? changeList.getName() : changeList.getComment(), new ArrayList<>(),
+                     false, synchronously, FunctionUtil.nullConstant(), null, false, null).doCommit();
   }
 
   @TestOnly
-  public boolean commitChangesSynchronouslyWithResult(@NotNull LocalChangeList changeList, @NotNull List<Change> changes) {
-    return doCommit(changeList, changes, true);
+  public void commitChangesSynchronouslyWithResult(@NotNull LocalChangeList changeList, @NotNull List<Change> changes) {
+    doCommit(changeList, changes, true);
   }
 
   @Override
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
index c89c90b8a03a..c163b6485799 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
@@ -129,6 +129,7 @@ public class CommitHelper {
       notNull(resultHandler, new DefaultCommitResultHandler(myProject, myIncludedChanges, myCommitMessage, myCommitProcessor, myFeedback));
   }
 
+  @SuppressWarnings("UnusedReturnValue")
   public boolean doCommit() {
     Task.Backgroundable task = new Task.Backgroundable(myProject, myActionName, true, myConfiguration.getCommitOption()) {
       public void run(@NotNull ProgressIndicator indicator) {
@@ -154,7 +155,7 @@ public class CommitHelper {
       }
     };
     ProgressManager.getInstance().run(task);
-    return hasOnlyWarnings(myCommitProcessor.getVcsExceptions());
+    return true;
   }
 
   private void delegateCommitToVcsThread() {
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestChangeListManager.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestChangeListManager.java
index 59ad53cf4b3a..ab62af36dd51 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestChangeListManager.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestChangeListManager.java
@@ -83,7 +83,7 @@ public class HgTestChangeListManager {
     final LocalChangeList list = peer.getDefaultChangeList();
     assertNotNull(list);
     peer.editComment(list.getName(), "A comment to a commit");
-    UIUtil.invokeAndWaitIfNeeded((Runnable)() -> Assert.assertTrue(peer.commitChangesSynchronouslyWithResult(list, changes)));
+    UIUtil.invokeAndWaitIfNeeded((Runnable)() -> peer.commitChangesSynchronouslyWithResult(list, changes));
     ensureUpToDate();
   }