Revert this stuff.

Author: jesseleite

dir/dir.go

@@ -1,6 +1,8 @@
 package dir
 
 import (
+	"strings"
+
 	"github.com/joshmedeski/sesh/v2/git"
 	"github.com/joshmedeski/sesh/v2/oswrap"
 	"github.com/joshmedeski/sesh/v2/pathwrap"
@@ -39,12 +41,38 @@ func (d *RealDir) Dir(path string) (isDir bool, absPath string) {
 }
 
 func (d *RealDir) RootDir(path string) (hasRootDir bool, absPath string) {
-	isGit, absPath, err := d.git.GitRoot(path)
-	if err != nil {
-		return false, ""
+	isGitBare, absPath := gitBareRootDir(d, path)
+	if isGitBare {
+		return true, absPath
 	}
+	isGit, absPath := gitRootDir(d, path)
 	if isGit {
 		return true, absPath
 	}
 	return false, ""
 }
+
+func gitBareRootDir(d *RealDir, path string) (hasRootDir bool, absPath string) {
+	isGitBare, commonDir, _ := d.git.GitCommonDir(path)
+	if isGitBare && strings.HasSuffix(commonDir, "/.bare") {
+		topLevelDir := strings.TrimSuffix(commonDir, "/.bare")
+		relativePath := strings.TrimPrefix(path, topLevelDir)
+		firstDir := strings.Split(relativePath, string("/"))[1]
+		name, err := d.path.Abs(topLevelDir + "/" + firstDir)
+		if err != nil {
+			return false, ""
+		}
+		return true, name
+	} else {
+		return false, ""
+	}
+}
+
+func gitRootDir(d *RealDir, path string) (hasDir bool, absPath string) {
+	isGit, topLevelDir, _ := d.git.ShowTopLevel(path)
+	if isGit && topLevelDir != "" {
+		return true, topLevelDir
+	} else {
+		return false, ""
+	}
+}

namer/namer.go

@@ -35,6 +35,7 @@ func (n *RealNamer) Name(path string) (string, error) {
 	}
 
 	strategies := []func(*RealNamer, string) (string, error){
+		gitBareName,
 		gitName,
 		dirName,
 	}

seshcli/root.go

@@ -3,29 +3,24 @@ package seshcli
 import (
 	"fmt"
 
-	"github.com/joshmedeski/sesh/v2/git"
-	"github.com/joshmedeski/sesh/v2/home"
-	"github.com/joshmedeski/sesh/v2/lister"
+	"github.com/joshmedeski/sesh/lister"
+	"github.com/joshmedeski/sesh/namer"
 	cli "github.com/urfave/cli/v2"
 )
 
-func Root(l lister.Lister, git git.Git, home home.Home) *cli.Command {
+func Root(l lister.Lister, n namer.Namer) *cli.Command {
 	return &cli.Command{
 		Name:                   "root",
 		Aliases:                []string{"r"},
-		Usage:                  "Show the root for the active session",
+		Usage:                  "Show the root from the active session",
 		UseShortOptionHandling: true,
 		Flags:                  []cli.Flag{},
 		Action: func(cCtx *cli.Context) error {
 			session, exists := l.GetAttachedTmuxSession()
 			if !exists {
-				return cli.Exit("Not attached to tmux session", 1)
+				return cli.Exit("No root found for session", 1)
 			}
-			_, path, err := git.GitRoot(session.Path)
-			if err != nil {
-				return cli.Exit(err, 1)
-			}
-			root, err := home.ShortenHome(path)
+			root, err := n.RootName(session.Path)
 			if err != nil {
 				return cli.Exit(err, 1)
 			}

seshcli/seshcli.go

@@ -76,7 +76,7 @@ func App(version string) cli.App {
 			Last(lister, tmux),
 			Connect(connector, icon, dir),
 			Clone(cloner),
-			Root(lister, git, home),
+			Root(lister, namer),
 			Preview(previewer),
 		},
 	}