shithub: furgit

Download patch

ref: 481fd4a4c1e9b54ce365db3105c7c71afb0c0e2a
parent: 4b8d39764f9b54ea3090d0fea92a23025dbea30d
author: Runxi Yu <me@runxiyu.org>
date: Sat Mar 7 12:04:02 EST 2026

mergebase: Fix lints

--- a/mergebase/integration_test.go
+++ b/mergebase/integration_test.go
@@ -35,10 +35,12 @@
 		store := testRepo.OpenObjectStore(t)
 
 		query := mergebase.Query(store, nil, left, tag)
+
 		all, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
 		}
+
 		got := oidSetFromSlice(all)
 
 		want := gitMergeBaseAllSet(t, testRepo, left, tag)
@@ -76,10 +78,12 @@
 		store := testRepo.OpenObjectStore(t)
 
 		query := mergebase.Query(store, nil, left, right)
+
 		all, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
 		}
+
 		got := oidSetFromSlice(all)
 
 		want := gitMergeBaseAllSet(t, testRepo, left, right)
@@ -135,10 +139,12 @@
 		graph := testRepo.OpenCommitGraph(t)
 
 		query := mergebase.Query(store, graph, left, right)
+
 		all, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
 		}
+
 		got := oidSetFromSlice(all)
 
 		want := gitMergeBaseAllSet(t, testRepo, left, right)
--- a/mergebase/unit_test.go
+++ b/mergebase/unit_test.go
@@ -84,6 +84,7 @@
 		right := store.AddObject(objecttype.TypeCommit, commitBody(tree, left))
 
 		query := mergebase.Query(store, nil, left, right)
+
 		got, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
@@ -130,6 +131,7 @@
 		tag := store.AddObject(objecttype.TypeTag, tagBody(right, objecttype.TypeCommit))
 
 		query := mergebase.Query(store, nil, left, tag)
+
 		got, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
@@ -179,10 +181,12 @@
 		right := store.AddObject(objecttype.TypeCommit, commitBody(rightTree, base2, base1))
 
 		query := mergebase.Query(store, nil, left, right)
+
 		all, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
 		}
+
 		got := toSet(all)
 
 		want := map[objectid.ObjectID]struct{}{base1: {}, base2: {}}
@@ -226,6 +230,7 @@
 		right := store.AddObject(objecttype.TypeCommit, commitBody(rightTree))
 
 		query := mergebase.Query(store, nil, left, right)
+
 		got, err := query.All()
 		if err != nil {
 			t.Fatalf("query.All(): %v", err)
@@ -261,6 +266,7 @@
 		tagToTree := store.AddObject(objecttype.TypeTag, tagBody(tree, objecttype.TypeTree))
 
 		query := mergebase.Query(store, nil, commit, tagToTree)
+
 		_, err := query.All()
 		if err == nil {
 			t.Fatal("expected error")
--