[MER-2744] fix: look for correct git dir path. (#200)

aviator-co · Sep 7, 2023 · 7923ddf · 7923ddf
1 parent 6360252
commit 7923ddf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/cmd/av/helpers.go b/cmd/av/helpers.go
@@ -18,18 +18,25 @@ var cachedRepo *git.Repo
 
 func getRepo() (*git.Repo, error) {
 	if cachedRepo == nil {
-		cmd := exec.Command("git", "rev-parse", "--show-toplevel")
+		cmd := exec.Command("git", "rev-parse", "--path-format=absolute", "--show-toplevel", "--git-common-dir")
+
 		if rootFlags.Directory != "" {
 			cmd.Dir = rootFlags.Directory
 		}
-		toplevel, err := cmd.Output()
+		paths, err := cmd.Output()
 		if err != nil {
 			return nil, errors.Wrap(
 				err,
-				"failed to determine repo toplevel (are you running inside a Git repo?)",
+				"failed to find git directory (are you running inside a Git repo?)",
 			)
 		}
-		cachedRepo, err = git.OpenRepo(strings.TrimSpace(string(toplevel)))
+
+        dir, gitDir, found := strings.Cut(strings.TrimSpace(string(paths)), "\n" )
+        if !found {
+            return nil, errors.New("Unexpected format, not able to parse toplevel and common dir.")
+        }
+
+		cachedRepo, err = git.OpenRepo(dir, gitDir)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to open git repo")
 		}

diff --git a/internal/git/git.go b/internal/git/git.go
@@ -20,12 +20,14 @@ var ErrRemoteNotFound = errors.Sentinel("this repository doesn't have a remote o
 
 type Repo struct {
 	repoDir string
+	gitDir string
 	log     logrus.FieldLogger
 }
 
-func OpenRepo(repoDir string) (*Repo, error) {
+func OpenRepo(repoDir string, gitDir string) (*Repo, error) {
 	r := &Repo{
 		repoDir,
+        gitDir,
 		logrus.WithFields(logrus.Fields{"repo": path.Base(repoDir)}),
 	}
 
@@ -37,7 +39,7 @@ func (r *Repo) Dir() string {
 }
 
 func (r *Repo) GitDir() string {
-	return path.Join(r.repoDir, ".git")
+	return r.gitDir
 }
 
 func (r *Repo) AvDir() string {

diff --git a/internal/git/gittest/repo.go b/internal/git/gittest/repo.go
@@ -3,6 +3,7 @@ package gittest
 import (
 	"os"
 	"os/exec"
+    "path"
 	"path/filepath"
 	"testing"
 
@@ -49,7 +50,7 @@ func NewTempRepo(t *testing.T) *git.Repo {
 	err = remoteInit.Run()
 	require.NoError(t, err, "failed to initialize remote git repository")
 
-	repo, err := git.OpenRepo(dir)
+	repo, err := git.OpenRepo(dir, path.Join(dir, ".git"))
 	require.NoError(t, err, "failed to open repo")
 
 	settings := map[string]string{