diff options
| -rw-r--r-- | object/tree_parse_test.go | 4 | ||||
| -rw-r--r-- | objectstore/packed/store.go | 1 | ||||
| -rw-r--r-- | repository/stored_test.go | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/object/tree_parse_test.go b/object/tree_parse_test.go index 51c1e5b2..03a36a72 100644 --- a/object/tree_parse_test.go +++ b/object/tree_parse_test.go @@ -60,11 +60,11 @@ func TestTreeParseFromGit(t *testing.T) { for _, want := range inserted.Entries { got := tree.Entry(want.Name) - if got == nil { //nolint:staticcheck + if got == nil { t.Fatalf("Entry(%q) returned nil", want.Name) } - if got.Mode != want.Mode || got.ID != want.ID { //nolint:staticcheck + if got.Mode != want.Mode || got.ID != want.ID { t.Fatalf("Entry(%q) mismatch", want.Name) } } diff --git a/objectstore/packed/store.go b/objectstore/packed/store.go index 7c1a2905..2da48dff 100644 --- a/objectstore/packed/store.go +++ b/objectstore/packed/store.go @@ -73,6 +73,7 @@ func New(root *os.Root, algo objectid.Algorithm) (*Store, error) { // Close releases mapped pack/index resources associated with the store. func (store *Store) Close() error { store.stateMu.Lock() + if store.closed { store.stateMu.Unlock() diff --git a/repository/stored_test.go b/repository/stored_test.go index febfc461..0ca88664 100644 --- a/repository/stored_test.go +++ b/repository/stored_test.go @@ -316,11 +316,11 @@ func TestReadStoredTreeMixedModes(t *testing.T) { for name, wantMode := range expect { entry := rootTree.Tree().Entry([]byte(name)) - if entry == nil { //nolint:staticcheck + if entry == nil { t.Fatalf("Entry(%q) returned nil", name) } - if entry.Mode != wantMode { //nolint:staticcheck + if entry.Mode != wantMode { t.Fatalf("Entry(%q) mode = %o, want %o", name, entry.Mode, wantMode) } } |