From 116c1b6aa4934487271404860cf0d52f38a6812f Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 11 Jun 2018 10:04:10 +0300
Subject: [PATCH] git: stop rebase when user clicks Cancel in squash commit
 message dialog

Fixes IDEA-180118
---
 .../src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
index e028626dffb2..e31d0cd02c71 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
@@ -76,7 +76,7 @@ public class GitInteractiveRebaseEditorHandler implements Closeable, GitRebaseEd
     try {
       if (myRebaseEditorShown) {
         myEditorCancelled = !handleUnstructuredEditor(path);
-        return 0;
+        return myEditorCancelled ? ERROR_EXIT_CODE : 0;
       }
       else {
         setRebaseEditorShown();