OSDN Git Service

RebaseDlg: Fix Edit don't show Amend button problem
authorFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 07:17:46 +0000 (15:17 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 07:17:46 +0000 (15:17 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/RebaseDlg.cpp

index 479a526..6114600 100644 (file)
@@ -985,8 +985,10 @@ int CRebaseDlg::DoRebase()
                                return 0;\r
                        }\r
                        if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+                       {\r
+                               this->m_RebaseStage = REBASE_EDIT ;\r
                                return -1; // Edit return -1 to stop rebase. \r
-                       \r
+                       }\r
                        // Squash Case\r
                        if(CheckNextCommitIsSquash())\r
                        {   // no squash\r
@@ -1010,7 +1012,10 @@ int CRebaseDlg::DoRebase()
                        return 0;\r
                }\r
                if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+               {\r
+                       this->m_RebaseStage = REBASE_EDIT ;\r
                        return -1; // Edit return -1 to stop rebase. \r
+               }\r
 \r
                // Squash Case\r
                if(CheckNextCommitIsSquash())\r