aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--object/tree/parse_test.go4
-rw-r--r--repository/commit_graph.go2
2 files changed, 4 insertions, 2 deletions
diff --git a/object/tree/parse_test.go b/object/tree/parse_test.go
index bf1c2fd0..2b98ede7 100644
--- a/object/tree/parse_test.go
+++ b/object/tree/parse_test.go
@@ -79,6 +79,7 @@ func TestTreeInsertEntryCopiesName(t *testing.T) {
t.Parallel()
var tr tree.Tree
+
name := []byte("alpha")
entry := tree.TreeEntry{
Mode: tree.FileModeRegular,
@@ -86,7 +87,8 @@ func TestTreeInsertEntryCopiesName(t *testing.T) {
ID: objectid.ObjectID{},
}
- if err := tr.InsertEntry(entry); err != nil {
+ err := tr.InsertEntry(entry)
+ if err != nil {
t.Fatalf("InsertEntry: %v", err)
}
diff --git a/repository/commit_graph.go b/repository/commit_graph.go
index b45d9da0..3f0a0888 100644
--- a/repository/commit_graph.go
+++ b/repository/commit_graph.go
@@ -20,7 +20,7 @@ func openCommitGraph(root *os.Root, algo objectid.Algorithm) (*commitgraphread.R
malformed.Reason == "missing commit-graph-chain" {
reader, err = commitgraphread.Open(root, algo, commitgraphread.OpenSingle)
if errors.Is(err, os.ErrNotExist) {
- return nil, nil
+ return nil, nil //nolint:nilnil
}
return reader, err