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 ---