From 31c6e181db1bb1d6d50124dcb8abfae6fb7a8d6e Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 16 Oct 2019 14:54:40 +0000 Subject: Add go brace whitespace formatter --- internal/git/catfile/batch_cache.go | 1 - internal/git/catfile/batch_cache_test.go | 1 - internal/git/catfile/catfile_test.go | 2 -- internal/git/hooks/hooks_test.go | 1 - internal/git/log/commit_test.go | 1 - internal/git/objectpool/fetch_test.go | 1 - internal/git/pktline/pkt_line_test.go | 1 - internal/git/proto.go | 2 -- internal/git/rawdiff/rawdiff_test.go | 1 - internal/git/remote/remote_test.go | 1 - 10 files changed, 12 deletions(-) (limited to 'internal/git') diff --git a/internal/git/catfile/batch_cache.go b/internal/git/catfile/batch_cache.go index 7d08cc598..153f20f66 100644 --- a/internal/git/catfile/batch_cache.go +++ b/internal/git/catfile/batch_cache.go @@ -176,7 +176,6 @@ func (bc *batchCache) lookup(k key) (int, bool) { if ent.key == k { return i, true } - } return -1, false diff --git a/internal/git/catfile/batch_cache_test.go b/internal/git/catfile/batch_cache_test.go index 510b91a7a..519c6ef28 100644 --- a/internal/git/catfile/batch_cache_test.go +++ b/internal/git/catfile/batch_cache_test.go @@ -162,7 +162,6 @@ func requireCacheValid(t *testing.T, bc *batchCache) { defer bc.Unlock() for _, ent := range bc.entries { - v := ent.value require.False(t, v.isClosed(), "values in cache should not be closed: %v %v", ent, v) } diff --git a/internal/git/catfile/catfile_test.go b/internal/git/catfile/catfile_test.go index 8825afbd1..0321c9c9e 100644 --- a/internal/git/catfile/catfile_test.go +++ b/internal/git/catfile/catfile_test.go @@ -119,7 +119,6 @@ func TestCommit(t *testing.T) { require.Equal(t, tc.output, string(contents)) }) } - } func TestTag(t *testing.T) { @@ -190,7 +189,6 @@ func TestTree(t *testing.T) { require.Equal(t, tc.output, string(contents)) }) } - } func TestRepeatedCalls(t *testing.T) { diff --git a/internal/git/hooks/hooks_test.go b/internal/git/hooks/hooks_test.go index 6c2657461..e58139953 100644 --- a/internal/git/hooks/hooks_test.go +++ b/internal/git/hooks/hooks_test.go @@ -33,5 +33,4 @@ func TestPath(t *testing.T) { require.Equal(t, "/var/empty", Path()) }) - } diff --git a/internal/git/log/commit_test.go b/internal/git/log/commit_test.go index fe0ea3afa..a70efdb36 100644 --- a/internal/git/log/commit_test.go +++ b/internal/git/log/commit_test.go @@ -97,7 +97,6 @@ func TestParseRawCommit(t *testing.T) { out, err := parseRawCommit(bytes.NewBuffer(tc.in), info) require.NoError(t, err, "parse error") require.Equal(t, tc.out, out) - }) } } diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go index 674f09375..a7ff6ba32 100644 --- a/internal/git/objectpool/fetch_test.go +++ b/internal/git/objectpool/fetch_test.go @@ -185,7 +185,6 @@ func TestFetchFromOriginRefUpdates(t *testing.T) { looseRefs := testhelper.MustRunCommand(t, nil, "find", filepath.Join(poolPath, "refs"), "-type", "f") require.Equal(t, "", string(looseRefs), "there should be no loose refs after the fetch") - } func resolveRef(t *testing.T, repo string, ref string) string { diff --git a/internal/git/pktline/pkt_line_test.go b/internal/git/pktline/pkt_line_test.go index 3024a31d1..8cbbeed07 100644 --- a/internal/git/pktline/pkt_line_test.go +++ b/internal/git/pktline/pkt_line_test.go @@ -60,7 +60,6 @@ func TestScanner(t *testing.T) { if tc.fail { require.Error(t, scanner.Err()) - } else { require.NoError(t, scanner.Err()) } diff --git a/internal/git/proto.go b/internal/git/proto.go index 17323c600..dce5408f8 100644 --- a/internal/git/proto.go +++ b/internal/git/proto.go @@ -100,7 +100,6 @@ func VersionLessThan(v1Str, v2Str string) (bool, error) { func versionLessThan(v1, v2 version) bool { switch { - case v1.major < v2.major: return true case v1.major > v2.major: @@ -119,7 +118,6 @@ func versionLessThan(v1, v2 version) bool { default: // this should only be reachable when versions are equal return false - } } diff --git a/internal/git/rawdiff/rawdiff_test.go b/internal/git/rawdiff/rawdiff_test.go index 21eb009b9..5877c0e18 100644 --- a/internal/git/rawdiff/rawdiff_test.go +++ b/internal/git/rawdiff/rawdiff_test.go @@ -9,7 +9,6 @@ import ( ) func TestParser(t *testing.T) { - testCases := []struct { desc string in string diff --git a/internal/git/remote/remote_test.go b/internal/git/remote/remote_test.go index ec4809d5e..af4c56a9e 100644 --- a/internal/git/remote/remote_test.go +++ b/internal/git/remote/remote_test.go @@ -48,7 +48,6 @@ func TestRemoveRemoteDontRemoveLocalBranches(t *testing.T) { out = testhelper.MustRunCommand(t, nil, "git", "-C", repoPath, "show-ref", "refs/heads/master") require.Equal(t, masterBeforeRemove, out) - } func TestRemoteExists(t *testing.T) { -- cgit v1.2.3