From 5dad9b23030e344a4fd1458df0c50e6ada55a01a Mon Sep 17 00:00:00 2001
From: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
Date: Sun, 9 Jul 2023 17:08:04 +1000
Subject: *: Handle paths starting with ~username

Signed-off-by: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
---
 repository.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'repository.go')

diff --git a/repository.go b/repository.go
index 168303f..02edb66 100644
--- a/repository.go
+++ b/repository.go
@@ -19,6 +19,7 @@ import (
 	"github.com/go-git/go-billy/v5/osfs"
 	"github.com/go-git/go-billy/v5/util"
 	"github.com/go-git/go-git/v5/config"
+	"github.com/go-git/go-git/v5/internal/path_util"
 	"github.com/go-git/go-git/v5/internal/revision"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/cache"
@@ -322,16 +323,13 @@ func PlainOpenWithOptions(path string, o *PlainOpenOptions) (*Repository, error)
 }
 
 func dotGitToOSFilesystems(path string, detect bool) (dot, wt billy.Filesystem, err error) {
-	if strings.HasPrefix(path, "~/") {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return nil, nil, err
-		}
-		path = filepath.Join(home, path[2:])
-	} else {
-		if path, err = filepath.Abs(path); err != nil {
-			return nil, nil, err
-		}
+	path, err = path_util.ReplaceTildeWithHome(path)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if path, err = filepath.Abs(path); err != nil {
+		return nil, nil, err
 	}
 
 	var fs billy.Filesystem
-- 
cgit