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: stop rebase when user clicks Cancel in squash commit message dialog

Browse Source 
Fixes IDEA-180118
This commit is contained in:
Kirill Likhodedov
2018-06-11 10:29:24 +03:00
parent 8bd74c4860
commit 116c1b6aa4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class GitInteractiveRebaseEditorHandler implements Closeable, GitRebaseEd
try { try {
if (myRebaseEditorShown) { if (myRebaseEditorShown) {
myEditorCancelled = !handleUnstructuredEditor(path); myEditorCancelled = !handleUnstructuredEditor(path);
return 0; return myEditorCancelled ? ERROR_EXIT_CODE : 0;
} }
else { else {
setRebaseEditorShown(); setRebaseEditorShown();