traverse: fix git

carapace-sh · Sep 3, 2023 · 526c707 · 526c707
1 parent c6b8ff3
commit 526c707
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/traverse/git.go b/pkg/traverse/git.go
@@ -9,14 +9,17 @@ func GitDir(tc Context) (string, error) {
 	if dir, ok := tc.LookupEnv("GIT_DIR"); ok {
 		return filepath.ToSlash(dir), nil
 	}
-	return Parent(".git")(tc)
+	dir, err := GitWorkTree(tc)
+	if err == nil {
+		dir += "/.git"
+	}
+	return dir, err
 }
 
 // GitWorkTree returns the location of the root of the working directory for a non-bare repository.
 func GitWorkTree(tc Context) (string, error) {
 	if dir, ok := tc.LookupEnv("GIT_WORK_TREE"); ok {
 		return filepath.ToSlash(dir), nil
 	}
-
-	return GitDir(tc)
+	return Parent(".git")(tc)
 }
diff --git a/pkg/traverse/traverse.go b/pkg/traverse/traverse.go
@@ -40,7 +40,7 @@ func Parent(names ...string) func(tc Context) (string, error) {
 func traverse(path string, name string) (target string, err error) {
 	var absPath string
 	if absPath, err = filepath.Abs(path); err == nil {
-		target = filepath.ToSlash(absPath + "/" + name)
+		target = filepath.ToSlash(absPath + "/" + strings.TrimSuffix(name, "/"))
 		if _, err = os.Stat(target); err != nil {
 			parent := filepath.Dir(absPath)
 			if parent != path {