From 1934938ba920597d355b1b02c24e3f89585daff3 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sat, 26 Jan 2013 23:04:19 +0800
Subject: [PATCH] CMassiveGitTask can be also used with non-path commands

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseProc/MassiveGitTask.cpp | 5 +++--
 src/TortoiseProc/MassiveGitTask.h   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/TortoiseProc/MassiveGitTask.cpp b/src/TortoiseProc/MassiveGitTask.cpp
index 8d5302a0b..d0dfd3f03 100644
--- a/src/TortoiseProc/MassiveGitTask.cpp
+++ b/src/TortoiseProc/MassiveGitTask.cpp
@@ -28,8 +28,9 @@
 
 static int maxCommandLineLength = SysInfo::Instance().IsWin7OrLater() ? MAX_COMMANDLINE_LENGTH_WIN7 : MAX_COMMANDLINE_LENGTH_WINXP;
 
-CMassiveGitTask::CMassiveGitTask(CString gitParameters)
+CMassiveGitTask::CMassiveGitTask(CString gitParameters, BOOL isPath)
 	: m_bUnused(true)
+	, m_bIsPath(isPath)
 	, m_NotifyCallbackInstance(NULL)
 	, m_NotifyCallbackMethod(NULL)
 	, m_NotifyCallbackAction(git_wc_notify_add)
@@ -88,7 +89,7 @@ bool CMassiveGitTask::ExecuteCommands(BOOL &cancel)
 				add += _T(" \"") + m_pathList[j].GetGitPathString() + _T("\"");
 
 			CString cmd, out;
-			cmd.Format(_T("git.exe %s --%s"), m_sParams, add);
+			cmd.Format(_T("git.exe %s %s%s"), m_sParams, m_bIsPath ? _T("--") : _T(""), add);
 			if (g_Git.Run(cmd, &out, CP_UTF8))
 			{
 				CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
diff --git a/src/TortoiseProc/MassiveGitTask.h b/src/TortoiseProc/MassiveGitTask.h
index 455071f02..5e0c3aa70 100644
--- a/src/TortoiseProc/MassiveGitTask.h
+++ b/src/TortoiseProc/MassiveGitTask.h
@@ -26,7 +26,7 @@ typedef BOOL (CGitProgressDlg::*NOTIFY_CALLBACK)(const CTGitPath& path, git_wc_n
 class CMassiveGitTask
 {
 public:
-	CMassiveGitTask(CString params);
+	CMassiveGitTask(CString params, BOOL isPath = TRUE);
 	~CMassiveGitTask(void);
 
 	void					AddFile(CString filename);
@@ -37,6 +37,7 @@ public:
 private:
 	bool					ExecuteCommands(BOOL &cancel);
 	bool					m_bUnused;
+	BOOL					m_bIsPath;
 	CString					m_sParams;
 	CTGitPathList			m_pathList;
 	CGitProgressDlg *		m_NotifyCallbackInstance;
-- 
2.11.4.GIT