From 6c61559399ae43a9c6ae7cd9fd51185c135968a2 Mon Sep 17 00:00:00 2001 From: Petar Perisin Date: Mon, 30 Sep 2013 01:46:10 +0200 Subject: Git: Allow push after fixup Direct push after fixup is really useful, especially on gerrit, because it allows easy fixing and direct pushing commits under HEAD. Change-Id: I83980e451c9ae86ac1ac0a55170d6d4141f27d49 Reviewed-by: Orgad Shaneh --- src/plugins/git/gitclient.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/plugins/git/gitclient.h') diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index f9d7f8a5fa..49c440168c 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -31,6 +31,7 @@ #define GITCLIENT_H #include "gitsettings.h" +#include "commitdata.h" #include @@ -110,7 +111,8 @@ public: enum StashResult { StashUnchanged, StashCanceled, StashFailed, Stashed, NotStashed /* User did not want it */ }; - bool init(const QString &workingDirectory, const QString &command, StashFlag flag = Default); + bool init(const QString &workingDirectory, const QString &command, + StashFlag flag = Default, PushAction pushAction = NoPush); bool stashingFailed() const; void end(); StashResult result() const { return m_stashResult; } @@ -125,6 +127,7 @@ public: QString m_workingDir; GitClient *m_client; StashFlag m_flags; + PushAction m_pushAction; }; static const char *stashNamePrefix; @@ -322,7 +325,8 @@ public: QProcessEnvironment processEnvironment() const; - bool beginStashScope(const QString &workingDirectory, const QString &command, StashFlag flag = Default); + bool beginStashScope(const QString &workingDirectory, const QString &command, + StashFlag flag = Default, PushAction pushAction = NoPush); StashInfo &stashInfo(const QString &workingDirectory); void endStashScope(const QString &workingDirectory); bool isValidRevision(const QString &revision) const; -- cgit v1.2.1