From db29090b05f70b01aa22032b042fc3497116e2da Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 28 Feb 2013 13:27:39 +0200
Subject: [PATCH] Git: Test if an operation is in progress on commit
Suggest to continue
Change-Id: I7d8d22d976efe446c2f60e2ba18bf08a123cca36
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
---
src/plugins/git/gitplugin.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 953c8c212a5..59d9d4edd4e 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -949,8 +949,10 @@ bool GitPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEdi
closeEditor = m_gitClient->addAndCommit(m_submitRepository, editor->panelData(),
m_commitAmendSHA1, m_commitMessageFileName, model);
}
- if (closeEditor)
+ if (closeEditor) {
cleanCommitMessageFile();
+ m_gitClient->continueCommandIfNeeded(m_submitRepository);
+ }
return closeEditor;
}
--
GitLab