diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:18:33 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:18:33 +0200 |
| commit | 9af0609c2df9957f75e1930acd19fee07d4a3043 (patch) | |
| tree | 439a02f9c0d0827ad875b5e4d90ca25ca66b6192 /storage | |
| parent | abb9ec0f3efea571b7f19b7391eb7c152c899f45 (diff) | |
| parent | 86f6ba1dea8972df7c017e01ddb2c097892bc220 (diff) | |
| download | go-git-9af0609c2df9957f75e1930acd19fee07d4a3043.tar.gz | |
*: upgrade to go-billy.v3, merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/filesystem/internal/dotgit/dotgit_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index 6151c8f..e3a3c00 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -445,7 +445,11 @@ func (s *SuiteDotGit) TestObject(c *C) { file, err := dir.Object(hash) c.Assert(err, IsNil) c.Assert(strings.HasSuffix( +<<<<<<< HEAD file.Name(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), +======= + file.Filename(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), +>>>>>>> 86f6ba1dea8972df7c017e01ddb2c097892bc220 Equals, true, ) } |