From 5679433f7cce4756e14bc767cf5f86fa5d78477a Mon Sep 17 00:00:00 2001
From: Jeff <632006142@qq.com>
Date: Wed, 24 Jun 2026 09:24:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8DTryGetDetectedBranc?=
 =?UTF-8?q?h=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE=E5=A4=8DTryGetBranchC?=
 =?UTF-8?q?ommitCountByDate=E5=9C=A8=E6=B8=B8=E7=A6=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E8=8E=B7=E5=8F=96=E5=88=86=E6=94=AF=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=BA=94=E5=BD=93=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=BF=9C=E7=A8=8B=E5=88=86=E6=94=AF=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=EF=BC=9Aorigin/master=20=E4=BD=86=E5=BD=93=E6=B5=85=E5=85=8B?=
 =?UTF-8?q?=E9=9A=86=E4=BB=93=E5=BA=93=EF=BC=8C=E6=9C=AC=E5=9C=B0=E4=BB=8E?=
 =?UTF-8?q?=E6=9C=AA=E6=8B=89=E5=8F=96=E8=BF=87=20origin/master=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=88=E6=89=A7=E8=A1=8C=EF=BC=9Agit=20fet?=
 =?UTF-8?q?ch=20origin/master=203=E3=80=81=E6=9B=B4=E6=96=B0md=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GitVer/GitVer_version.cpp | 6 ++++--
 README.md                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/GitVer/GitVer_version.cpp b/GitVer/GitVer_version.cpp
index 111906e..f64f61f 100644
--- a/GitVer/GitVer_version.cpp
+++ b/GitVer/GitVer_version.cpp
@@ -38,7 +38,9 @@ BOOL TryGetCurrentBranch(LPCTSTR lpRepoPath, CString& strBranch)
 BOOL TryGetDetectedBranch(LPCTSTR lpRepoPath, CString& strBranch)
 {
 	// 远程仓库名必须以 origin 开头;
-	strBranch = StartProcess(NULL, _T("cmd /c git branch -r --contains HEAD | head -n1 | sed 's/.*origin\\///'"), lpRepoPath);
+	// "C:\Program Files\Git\bin\bash.exe" -c "git branch -r --contains HEAD | head -n1 | sed 's/.*origin\///'"
+	strBranch = StartProcess(NULL, _T("\"C:\\Program Files\\Git\\bin\\bash.exe\" -c \"git branch -r --contains HEAD | head -n1 | sed 's/.*origin\\///'\""), lpRepoPath);
+	//strBranch = StartProcess("C:\\Program Files\\Git\\bin\\bash.exe", _T("git branch -r --contains HEAD | head -n1 | sed 's/.*origin\\///'"), lpRepoPath);
 	strBranch.Replace(_T("\r"), _T(""));
 	strBranch.Replace(_T("\n"), _T(""));
 	strBranch.Trim();
@@ -202,7 +204,7 @@ BOOL TryGetBranchCommitCountByDate(LPCTSTR lpRepoPath, const CString& strBranch,
 
 	CString strCmd;
 	strCmd.Format(
-		_T("cmd /c git rev-list --count --since=\"%s 00:00:00\" --until=\"%s 23:59:59\" \"%s\""),
+		_T("cmd /c git rev-list --count --since=\"%s 00:00:00\" --until=\"%s 23:59:59\" \"origin/%s\""),
 		strDate.GetString(),
 		strDate.GetString(),
 		strBranch.GetString());
diff --git a/README.md b/README.md
index 8808a03..e83ce43 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # GitVer
 
 鍛戒护琛岀増鏈鐞嗗伐鍏凤紝浠� Git 浠撳簱璇诲彇 tag 鑷姩鐢熸垚骞跺洖鍐欑増鏈彿銆�
+蹇呴』瀹夎Git for Windows锛屼笖瀹夎鐩綍榛樿鍦–鐩橈細C:\Program Files\Git
 
 ---