diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2017-08-02 17:45:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 17:45:41 +0200 |
commit | 3713791015259f9e32cfe5fee76f9c99fc43fffd (patch) | |
tree | d6b9a7b601dfbf16af7193aa22cfc849409ec4f7 /worktree_test.go | |
parent | a0885c5fe132f109aeb7b09aa69ab138952961a6 (diff) | |
parent | 5c1a2ec798eb9b78d66b16fbbcbdc3b928d8b496 (diff) | |
download | go-git-3713791015259f9e32cfe5fee76f9c99fc43fffd.tar.gz |
Merge pull request #526 from joshbetz/fix/filename-form
Normalize filenames before comparing.
Diffstat (limited to 'worktree_test.go')
-rw-r--r-- | worktree_test.go | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/worktree_test.go b/worktree_test.go index c14d3bc..3ca26bc 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -7,6 +7,8 @@ import ( "os" "path/filepath" + "golang.org/x/text/unicode/norm" + "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/filemode" @@ -304,6 +306,47 @@ func (s *WorktreeSuite) TestCheckoutSymlink(c *C) { c.Assert(err, IsNil) } +func (s *WorktreeSuite) TestFilenameNormalization(c *C) { + url := c.MkDir() + path := fixtures.Basic().ByTag("worktree").One().Worktree().Root() + + server, err := PlainClone(url, false, &CloneOptions{ + URL: path, + }) + + filename := "페" + + w, err := server.Worktree() + c.Assert(err, IsNil) + util.WriteFile(w.Filesystem, filename, []byte("foo"), 0755) + _, err = w.Add(filename) + c.Assert(err, IsNil) + _, err = w.Commit("foo", &CommitOptions{Author: defaultSignature()}) + c.Assert(err, IsNil) + + r, err := Clone(memory.NewStorage(), memfs.New(), &CloneOptions{ + URL: url, + }) + + w, err = r.Worktree() + c.Assert(err, IsNil) + + status, err := w.Status() + c.Assert(err, IsNil) + c.Assert(status.IsClean(), Equals, true) + + err = w.Filesystem.Remove(filename) + c.Assert(err, IsNil) + + modFilename := norm.Form(norm.NFKD).String(filename) + util.WriteFile(w.Filesystem, modFilename, []byte("foo"), 0755) + _, err = w.Add(filename) + + status, err = w.Status() + c.Assert(err, IsNil) + c.Assert(status.IsClean(), Equals, true) +} + func (s *WorktreeSuite) TestCheckoutSubmodule(c *C) { url := "https://github.com/git-fixtures/submodule.git" r := s.NewRepositoryWithEmptyWorktree(fixtures.ByURL(url).One()) |