Merge pull request #772 from Jleagle/master

Replace user dir in path

2 files changed, 47 insertions, 0 deletions

diff --git a/plumbing/format/gitignore/dir.go b/plumbing/format/gitignore/dir.go
index bb78655..bf6a1c1 100644
--- a/plumbing/format/gitignore/dir.go
+++ b/plumbing/format/gitignore/dir.go
@@ -25,6 +25,14 @@ const (
 
 // readIgnoreFile reads a specific git ignore file.
 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)
+		}
+	}
+
 	f, err := fs.Open(fs.Join(append(path, ignoreFile)...))
 	if err == nil {
 		defer f.Close()
diff --git a/plumbing/format/gitignore/dir_test.go b/plumbing/format/gitignore/dir_test.go
index facc36d..7cd37dd 100644
--- a/plumbing/format/gitignore/dir_test.go
+++ b/plumbing/format/gitignore/dir_test.go
@@ -12,6 +12,7 @@ import (
 type MatcherSuite struct {
 	GFS  billy.Filesystem // git repository root
 	RFS  billy.Filesystem // root that contains user home
+	RFSR billy.Filesystem // root that contains user home, but with with relative ~/.gitignore_global
 	MCFS billy.Filesystem // root that contains user home, but missing ~/.gitconfig
 	MEFS billy.Filesystem // root that contains user home, but missing excludesfile entry
 	MIFS billy.Filesystem // root that contains user home, but missing .gitignore
@@ -95,6 +96,33 @@ func (s *MatcherSuite) SetUpTest(c *C) {
 
 	s.RFS = fs
 
+	// root that contains user home, but with relative ~/.gitignore_global
+	fs = memfs.New()
+	err = fs.MkdirAll(home, os.ModePerm)
+	c.Assert(err, IsNil)
+
+	f, err = fs.Create(fs.Join(home, gitconfigFile))
+	c.Assert(err, IsNil)
+	_, err = f.Write([]byte("[core]\n"))
+	c.Assert(err, IsNil)
+	_, err = f.Write([]byte("	excludesfile = ~/.gitignore_global" + "\n"))
+	c.Assert(err, IsNil)
+	err = f.Close()
+	c.Assert(err, IsNil)
+
+	f, err = fs.Create(fs.Join(home, ".gitignore_global"))
+	c.Assert(err, IsNil)
+	_, err = f.Write([]byte("# IntelliJ\n"))
+	c.Assert(err, IsNil)
+	_, err = f.Write([]byte(".idea/\n"))
+	c.Assert(err, IsNil)
+	_, err = f.Write([]byte("*.iml\n"))
+	c.Assert(err, IsNil)
+	err = f.Close()
+	c.Assert(err, IsNil)
+
+	s.RFSR = fs
+
 	// root that contains user home, but missing ~/.gitconfig
 	fs = memfs.New()
 	err = fs.MkdirAll(home, os.ModePerm)
@@ -194,6 +222,17 @@ func (s *MatcherSuite) TestDir_ReadPatterns(c *C) {
 	c.Assert(m.Match([]string{"vendor", "github.com"}, true), Equals, false)
 }
 
+func (s *MatcherSuite) TestDir_ReadRelativeGlobalGitIgnore(c *C) {
+	ps, err := LoadGlobalPatterns(s.RFSR)
+	c.Assert(err, IsNil)
+	c.Assert(ps, HasLen, 2)
+
+	m := NewMatcher(ps)
+	c.Assert(m.Match([]string{".idea/"}, true), Equals, false)
+	c.Assert(m.Match([]string{"*.iml"}, true), Equals, true)
+	c.Assert(m.Match([]string{"IntelliJ"}, true), Equals, false)
+}
+
 func (s *MatcherSuite) TestDir_LoadGlobalPatterns(c *C) {
 	ps, err := LoadGlobalPatterns(s.RFS)
 	c.Assert(err, IsNil)