Merge pull request #361 from wakatime/bugfix/project-detection#recursion

Fix infinite loop for Windows
wakatime · May 6, 2021 · 7a938b5 · 7a938b5
2 parents 3db2c2e + deb7392
commit 7a938b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/project/git.go b/pkg/project/git.go
@@ -154,7 +154,7 @@ func findGitConfigFile(fp string, directory string, match string) (string, bool)
 	}
 
 	dir := filepath.Clean(filepath.Join(fp, ".."))
-	if dir == "/" || driveLetterRegex.MatchString(dir) {
+	if dir == "." || dir == "/" || driveLetterRegex.MatchString(dir) {
 		return "", false
 	}
 

diff --git a/pkg/project/mercurial.go b/pkg/project/mercurial.go
@@ -61,7 +61,7 @@ func findHgConfigDir(fp string) (string, bool) {
 	}
 
 	dir := filepath.Clean(filepath.Join(fp, ".."))
-	if dir == "/" {
+	if dir == "." || dir == "/" || driveLetterRegex.MatchString(dir) {
 		return "", false
 	}