MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: fix the case when empty cherry-pick is in the middle of sequence

Browse Source 
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.
This commit is contained in:
Kirill Likhodedov
2017-02-07 11:51:06 +00:00
parent 6b3e8f81b2
commit a12db512a5
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
-1
View File
@@ -193,7 +193,6 @@ public class GitCherryPicker extends VcsCherryPicker {
}
else if (isNothingToCommitMessage(result)) {
alreadyPicked.add(commitWrapper);
return true;
}
else {
notifyError(result.getErrorOutputAsHtmlString(), commitWrapper, successfulCommits);