Merge pull request #1 from nulab/patch-1149

Patch 1149
nulab · May 17, 2019 · 1114a49 · 1114a49
2 parents 24de5ef + 5132088
commit 1114a49
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go
@@ -33,8 +33,9 @@ const (
 
 	tmpPackedRefsPrefix = "._packed-refs"
 
-	packExt = ".pack"
-	idxExt  = ".idx"
+	packPrefix = "pack-"
+	packExt    = ".pack"
+	idxExt     = ".idx"
 )
 
 var (
@@ -224,11 +225,11 @@ func (d *DotGit) objectPacks() ([]plumbing.Hash, error) {
 
 	var packs []plumbing.Hash
 	for _, f := range files {
-		if !strings.HasSuffix(f.Name(), packExt) {
+		n := f.Name()
+		if !strings.HasSuffix(n, packExt) || !strings.HasPrefix(n, packPrefix) {
 			continue
 		}
 
-		n := f.Name()
 		h := plumbing.NewHash(n[5 : len(n)-5]) //pack-(hash).pack
 		if h.IsZero() {
 			// Ignore files with badly-formatted names.

diff --git a/storage/filesystem/dotgit/dotgit_test.go b/storage/filesystem/dotgit/dotgit_test.go
@@ -463,6 +463,11 @@ func testObjectPacks(c *C, fs billy.Filesystem, dir *DotGit, f *fixtures.Fixture
 	c.Assert(err, IsNil)
 	err = badFile.Close()
 	c.Assert(err, IsNil)
+	// temporary file generated by git gc
+	tmpFile, err := fs.Create("objects/pack/.tmp-11111-pack-58rf8y4wm1b1k52bpe0kdlx6lpreg6ahso8n3ylc.pack")
+	c.Assert(err, IsNil)
+	err = tmpFile.Close()
+	c.Assert(err, IsNil)
 
 	hashes2, err := dir.ObjectPacks()
 	c.Assert(err, IsNil)