From a12db512a587bf3e8dddf093eb295150630772ea Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 15 Jan 2017 19:09:18 +0300
Subject: [PATCH] git: fix the case when empty cherry-pick is in the middle of
 sequence

IDEA-73548 was fixed a long time ago and solved the problem when empty cherry-pick was the only one (or the last).
However if an empty commit was in the middle of the queue, the rest of cherry-picking queue was ignored.
---
 plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
index 289806c256d0..3126914c2fb5 100644
--- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
@@ -193,7 +193,6 @@ public class GitCherryPicker extends VcsCherryPicker {
       }
       else if (isNothingToCommitMessage(result)) {
         alreadyPicked.add(commitWrapper);
-        return true;
       }
       else {
         notifyError(result.getErrorOutputAsHtmlString(), commitWrapper, successfulCommits);