diff --git a/git/command.go b/git/command.go index 4508d49ae959c4ee72695111dcdc6e40bc575af4..838fb0e998f7cab9c34ea15b5aa39a7be36d60e7 100644 --- a/git/command.go +++ b/git/command.go @@ -1,6 +1,6 @@ package git -import "github.com/aymanbagabas/git-module" +import git "github.com/aymanbagabas/git-module" // RunInDirOptions are options for RunInDir. type RunInDirOptions = git.RunInDirOptions diff --git a/git/commit.go b/git/commit.go index e833c8a7f3647e34a59b5125b9f7732da9a37203..5f073f682c18d41ae4e8142ac47104799d41c3fa 100644 --- a/git/commit.go +++ b/git/commit.go @@ -3,7 +3,7 @@ package git import ( "regexp" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) // ZeroID is the zero hash. diff --git a/git/errors.go b/git/errors.go index b77e9bfb2d8962301014dead00dbbbe09741215a..abbb1249660886d9234a4f9769c6723a198afb9d 100644 --- a/git/errors.go +++ b/git/errors.go @@ -3,7 +3,7 @@ package git import ( "errors" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) var ( diff --git a/git/patch.go b/git/patch.go index ad8d98255eabd255fb0d0e403d2eec21dfb81860..6a31217c94f9dcbbb3feb22148c7e64eb2a2657e 100644 --- a/git/patch.go +++ b/git/patch.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" "github.com/dustin/go-humanize/english" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/git/reference.go b/git/reference.go index e634dd42d2b9e8419012ae4b713c7d230d4e78d7..b6565327922a42b454c43b7842896a384e29c1f2 100644 --- a/git/reference.go +++ b/git/reference.go @@ -3,7 +3,7 @@ package git import ( "strings" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) const ( diff --git a/git/repo.go b/git/repo.go index 382f07ee0df1b9d0e2df26940ec37b8cf4b1a4e4..c2847055c504f0f3647ee32c33f9e2d1d7a7c280 100644 --- a/git/repo.go +++ b/git/repo.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) var ( diff --git a/git/server.go b/git/server.go index e853681451c6162744d22557da3d78ca30c8fe05..998ec4560cdf32dccddf761cf31fa217959b9ff4 100644 --- a/git/server.go +++ b/git/server.go @@ -3,7 +3,7 @@ package git import ( "context" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) // UpdateServerInfo updates the server info file for the given repo path. diff --git a/git/stash.go b/git/stash.go index 05e1b09925f8560f22ac1c01ee47eb5dd503919f..2e0739b1def2cf3c5f3e44c1878743a1cbb2301c 100644 --- a/git/stash.go +++ b/git/stash.go @@ -1,6 +1,6 @@ package git -import "github.com/aymanbagabas/git-module" +import git "github.com/aymanbagabas/git-module" // StashDiff returns the diff of the given stash index. func (r *Repository) StashDiff(index int) (*Diff, error) { diff --git a/git/tag.go b/git/tag.go index d276ec68543e5e2d469e37c9befc9eee6a3fd1b1..0ea37d9086e1a931660b649277f9923de3af8c33 100644 --- a/git/tag.go +++ b/git/tag.go @@ -1,6 +1,6 @@ package git -import "github.com/aymanbagabas/git-module" +import git "github.com/aymanbagabas/git-module" // Tag is a git tag. type Tag = git.Tag diff --git a/git/tree.go b/git/tree.go index 7bf5b4d26b64007568cc1f9ae39550b470161511..83b5c8307e392c07a8ee13ac1d53f0030676f727 100644 --- a/git/tree.go +++ b/git/tree.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sort" - "github.com/aymanbagabas/git-module" + git "github.com/aymanbagabas/git-module" ) // Tree is a wrapper around git.Tree with helper methods. diff --git a/git/types.go b/git/types.go index 44bad80a8a1f7f362b3623a7ef5b5ead335dd6b4..1e515b9a723ad03881415ba4b5037cfe7f75c09d 100644 --- a/git/types.go +++ b/git/types.go @@ -1,6 +1,6 @@ package git -import "github.com/aymanbagabas/git-module" +import git "github.com/aymanbagabas/git-module" // CommandOptions contain options for running a git command. type CommandOptions = git.CommandOptions diff --git a/pkg/web/auth.go b/pkg/web/auth.go index 0d8f6d49737b2585cda0720c1567f5e4470cd229..0b7b1e6b6a0b81f75c2bb598c90adbe6e6553e62 100644 --- a/pkg/web/auth.go +++ b/pkg/web/auth.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" - "github.com/golang-jwt/jwt/v5" + jwt "github.com/golang-jwt/jwt/v5" ) // authenticate authenticates the user from the request. diff --git a/pkg/web/context.go b/pkg/web/context.go index 725e80b201b71ececfd0edc85515d22da1ac4464..0ca966f8dca6b92dc507e732a50c21efd1a7af3a 100644 --- a/pkg/web/context.go +++ b/pkg/web/context.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" diff --git a/pkg/web/git.go b/pkg/web/git.go index b01f3aa519efc87d0081aac6e417832f58cd388a..9522783ad714ffba18dd3b8f8c3adde072e3bbac 100644 --- a/pkg/web/git.go +++ b/pkg/web/git.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" gitb "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" diff --git a/pkg/web/git_lfs.go b/pkg/web/git_lfs.go index 9149d4f8ee7a56290b33daf53cec104f4e94c6ab..b105979ce3beac15625ca81a6977ed54dd1827dd 100644 --- a/pkg/web/git_lfs.go +++ b/pkg/web/git_lfs.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/web/goget.go b/pkg/web/goget.go index b6678ff9184dd323a232a02d0ee41eb37feffa7e..b27890f3eaa94264cbb90f3251f6e05f7618f4f5 100644 --- a/pkg/web/goget.go +++ b/pkg/web/goget.go @@ -6,7 +6,7 @@ import ( "path" "text/template" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/utils" diff --git a/pkg/web/http.go b/pkg/web/http.go index 0cdc57b1bb087d395b577441d5659b93adbb580b..028aaca0e199ed742d9b08b2bdfefc0821f0874b 100644 --- a/pkg/web/http.go +++ b/pkg/web/http.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" ) diff --git a/pkg/web/logging.go b/pkg/web/logging.go index b9a264f55988d5b6697bae25e38afba276033ca9..1c00932f441f072156b143930486ac640dd47796 100644 --- a/pkg/web/logging.go +++ b/pkg/web/logging.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/charmbracelet/log/v2" - "github.com/dustin/go-humanize" + log "github.com/charmbracelet/log/v2" + humanize "github.com/dustin/go-humanize" ) // logWriter is a wrapper around http.ResponseWriter that allows us to capture diff --git a/pkg/web/server.go b/pkg/web/server.go index a5cb490ed4b20f54c49f93775affc640594a6970..ff329684931d0afcda960179e66745755e104019 100644 --- a/pkg/web/server.go +++ b/pkg/web/server.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/charmbracelet/log/v2" + log "github.com/charmbracelet/log/v2" "github.com/gorilla/handlers" "github.com/gorilla/mux" ) diff --git a/soft b/soft new file mode 100755 index 0000000000000000000000000000000000000000..53c762342d70fa138e81116ae8a7a67568c87169 Binary files /dev/null and b/soft differ