From 6dc3c590f79b18c95a6a4b51187b18f256b5f671 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Mon, 6 Nov 2023 17:03:56 -0500 Subject: [PATCH] fix: lint issues --- git/patch.go | 2 +- pkg/git/git.go | 2 +- pkg/lfs/scanner.go | 2 +- pkg/ssh/cmd/branch.go | 2 +- pkg/ui/pages/repo/files.go | 2 +- pkg/ui/pages/repo/stash.go | 2 +- pkg/ui/pages/repo/stashitem.go | 2 +- pkg/webhook/push.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/git/patch.go b/git/patch.go index 9e8735b8c..ad8d98255 100644 --- a/git/patch.go +++ b/git/patch.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/dustin/go-humanize/english" "github.com/aymanbagabas/git-module" + "github.com/dustin/go-humanize/english" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/pkg/git/git.go b/pkg/git/git.go index e3d3d485a..e523b90a2 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/log" "github.com/charmbracelet/soft-serve/git" "github.com/go-git/go-git/v5/plumbing/format/pktline" - gitm "github.com/aymanbagabas/git-module" ) // WritePktline encodes and writes a pktline to the given writer. diff --git a/pkg/lfs/scanner.go b/pkg/lfs/scanner.go index 344ed43cb..6cd19691f 100644 --- a/pkg/lfs/scanner.go +++ b/pkg/lfs/scanner.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/charmbracelet/soft-serve/git" gitm "github.com/aymanbagabas/git-module" + "github.com/charmbracelet/soft-serve/git" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/pkg/ssh/cmd/branch.go b/pkg/ssh/cmd/branch.go index 2a512159d..c43ce974f 100644 --- a/pkg/ssh/cmd/branch.go +++ b/pkg/ssh/cmd/branch.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/charmbracelet/soft-serve/pkg/webhook" - gitm "github.com/aymanbagabas/git-module" "github.com/spf13/cobra" ) diff --git a/pkg/ui/pages/repo/files.go b/pkg/ui/pages/repo/files.go index 828e81bae..4d5585364 100644 --- a/pkg/ui/pages/repo/files.go +++ b/pkg/ui/pages/repo/files.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/alecthomas/chroma/lexers" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" @@ -15,7 +16,6 @@ import ( "github.com/charmbracelet/soft-serve/pkg/ui/common" "github.com/charmbracelet/soft-serve/pkg/ui/components/code" "github.com/charmbracelet/soft-serve/pkg/ui/components/selector" - gitm "github.com/aymanbagabas/git-module" ) type filesView int diff --git a/pkg/ui/pages/repo/stash.go b/pkg/ui/pages/repo/stash.go index deb670a31..2d1fa69ff 100644 --- a/pkg/ui/pages/repo/stash.go +++ b/pkg/ui/pages/repo/stash.go @@ -3,6 +3,7 @@ package repo import ( "fmt" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" @@ -12,7 +13,6 @@ import ( "github.com/charmbracelet/soft-serve/pkg/ui/common" "github.com/charmbracelet/soft-serve/pkg/ui/components/code" "github.com/charmbracelet/soft-serve/pkg/ui/components/selector" - gitm "github.com/aymanbagabas/git-module" ) type stashState int diff --git a/pkg/ui/pages/repo/stashitem.go b/pkg/ui/pages/repo/stashitem.go index 128c5b5d1..cc2d3f3a0 100644 --- a/pkg/ui/pages/repo/stashitem.go +++ b/pkg/ui/pages/repo/stashitem.go @@ -4,11 +4,11 @@ import ( "fmt" "io" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/soft-serve/pkg/ui/common" - gitm "github.com/aymanbagabas/git-module" ) // StashItem represents a stash item. diff --git a/pkg/webhook/push.go b/pkg/webhook/push.go index 30bb5be3d..8af2c1398 100644 --- a/pkg/webhook/push.go +++ b/pkg/webhook/push.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + gitm "github.com/aymanbagabas/git-module" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/charmbracelet/soft-serve/pkg/store" - gitm "github.com/aymanbagabas/git-module" ) // PushEvent is a push event.