Allow calling sync from within a subfolder of a repo

GitJournal · May 12, 2022 · eac8e50 · eac8e50
1 parent 1ef7809
commit eac8e50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/common/fetch.go b/common/fetch.go
@@ -6,7 +6,7 @@ import (
 )
 
 func fetch(repoPath string) error {
-	r, err := git.PlainOpen(repoPath)
+	r, err := git.PlainOpenWithOptions(repoPath, &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		return tracerr.Wrap(err)
 	}

diff --git a/common/ignore.go b/common/ignore.go
@@ -40,7 +40,7 @@ func shouldIgnoreFile(repoPath string, fullFilePath string) (bool, error) {
 }
 
 func isFileIgnoredByGit(repoPath string, filePath string) (bool, error) {
-	repo, err := git.PlainOpen(repoPath)
+	repo, err := git.PlainOpenWithOptions(repoPath, &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		return false, tracerr.Wrap(err)
 	}

diff --git a/common/rebase.go b/common/rebase.go
@@ -58,7 +58,7 @@ type branchInfo struct {
 }
 
 func fetchBranchInfo(repoPath string) (branchInfo, error) {
-	repo, err := git.PlainOpen(repoPath)
+	repo, err := git.PlainOpenWithOptions(repoPath, &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		return branchInfo{}, tracerr.Wrap(err)
 	}

diff --git a/daemon.go b/daemon.go
@@ -71,7 +71,7 @@ func isValidGitRepo(repoPath string) error {
 		return tracerr.Errorf("%w - %s", errRepoPathInvalid, repoPath)
 	}
 
-	_, err = git.PlainOpen(repoPath)
+	_, err = git.PlainOpenWithOptions(repoPath, &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		return tracerr.Errorf("Not a valid git repo - %s\n%w", repoPath, err)
 	}