diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | bug/bug_actions_test.go | 3 | ||||
| -rw-r--r-- | bug/bug_test.go | 3 | ||||
| -rw-r--r-- | bug/label.go | 2 | ||||
| -rw-r--r-- | graphql/handler.go | 3 | ||||
| -rw-r--r-- | repository/tree_entry_test.go | 3 | ||||
| -rw-r--r-- | util/text/text.go | 7 |
7 files changed, 9 insertions, 16 deletions
@@ -19,7 +19,7 @@ debug-build: install: go generate - go install . + go install -ldflags "$(LDFLAGS)" . test: go test -bench=. ./... @@ -30,7 +30,7 @@ pack-webui: # produce a build that will fetch the web UI from the filesystem instead of from the binary debug-webui: - go build -tags=debugwebui + go build -ldflags "$(LDFLAGS)" -tags=debugwebui clean-local-bugs: git for-each-ref refs/bugs/ | cut -f 2 | xargs -r -n 1 git update-ref -d diff --git a/bug/bug_actions_test.go b/bug/bug_actions_test.go index 4d42fb1d..345b5e9a 100644 --- a/bug/bug_actions_test.go +++ b/bug/bug_actions_test.go @@ -1,13 +1,12 @@ package bug import ( + "testing" "time" "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/util/test" "github.com/stretchr/testify/require" - - "testing" ) func TestPushPull(t *testing.T) { diff --git a/bug/bug_test.go b/bug/bug_test.go index e104f921..4c3952eb 100644 --- a/bug/bug_test.go +++ b/bug/bug_test.go @@ -1,13 +1,12 @@ package bug import ( + "testing" "time" "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/repository" "github.com/stretchr/testify/assert" - - "testing" ) func TestBugId(t *testing.T) { diff --git a/bug/label.go b/bug/label.go index b73222dd..0ad84f22 100644 --- a/bug/label.go +++ b/bug/label.go @@ -28,7 +28,7 @@ func (l *Label) UnmarshalGQL(v interface{}) error { // MarshalGQL implements the graphql.Marshaler interface func (l Label) MarshalGQL(w io.Writer) { - w.Write([]byte(`"` + l.String() + `"`)) + _, _ = w.Write([]byte(`"` + l.String() + `"`)) } func (l Label) Validate() error { diff --git a/graphql/handler.go b/graphql/handler.go index 1e8498c8..aadcf4cb 100644 --- a/graphql/handler.go +++ b/graphql/handler.go @@ -4,11 +4,12 @@ package graphql import ( + "net/http" + "github.com/99designs/gqlgen/handler" "github.com/MichaelMure/git-bug/graphql/graph" "github.com/MichaelMure/git-bug/graphql/resolvers" "github.com/MichaelMure/git-bug/repository" - "net/http" ) // Handler is the root GraphQL http handler diff --git a/repository/tree_entry_test.go b/repository/tree_entry_test.go index b5f774d3..58da075c 100644 --- a/repository/tree_entry_test.go +++ b/repository/tree_entry_test.go @@ -1,8 +1,9 @@ package repository import ( - "github.com/MichaelMure/git-bug/util/git" "testing" + + "github.com/MichaelMure/git-bug/util/git" ) func TestTreeEntryFormat(t *testing.T) { diff --git a/util/text/text.go b/util/text/text.go index 81cc870b..87db8c30 100644 --- a/util/text/text.go +++ b/util/text/text.go @@ -323,10 +323,3 @@ func splitWord(word string, length int) (string, string) { return string(result), string(leftover) } - -func minInt(a, b int) int { - if a > b { - return b - } - return a -} |