Merge pull request #785 from AriehSchneier/gitignore-relative-any-user

plumbing: gitignore, Allow gitconfig to contain a gitignore relative to any user home. Fixes #578

1 files changed, 13 insertions, 3 deletions

diff --git a/plumbing/format/gitignore/dir.go b/plumbing/format/gitignore/dir.go
index bf6a1c1..3c4469a 100644
--- a/plumbing/format/gitignore/dir.go
+++ b/plumbing/format/gitignore/dir.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"io"
 	"os"
+	"os/user"
 	"strings"
 
 	"github.com/go-git/go-billy/v5"
@@ -27,9 +28,18 @@ const (
 func readIgnoreFile(fs billy.Filesystem, path []string, ignoreFile string) (ps []Pattern, err error) {
 
 	if strings.HasPrefix(ignoreFile, "~") {
-		home, err := os.UserHomeDir()
-		if err == nil {
-			ignoreFile = strings.Replace(ignoreFile, "~", home, 1)
+		firstSlash := strings.Index(ignoreFile, "/")
+		if firstSlash == 1 {
+			home, err := os.UserHomeDir()
+			if err == nil {
+				ignoreFile = strings.Replace(ignoreFile, "~", home, 1)
+			}
+		} else if firstSlash > 1 {
+			username := ignoreFile[1:firstSlash]
+			userAccount, err := user.Lookup(username)
+			if err == nil {
+				ignoreFile = strings.Replace(ignoreFile, ignoreFile[:firstSlash], userAccount.HomeDir, 1)
+			}
 		}
 	}