Fix import aliases for log, jwt, humanize, and git-module packages

copilot-swe-agent[bot] and andreynering created 2 months ago

Co-authored-by: andreynering <[e-mail]>

Change summary

git/command.go     | 2 +-
git/commit.go      | 2 +-
git/errors.go      | 2 +-
git/patch.go       | 2 +-
git/reference.go   | 2 +-
git/repo.go        | 2 +-
git/server.go      | 2 +-
git/stash.go       | 2 +-
git/tag.go         | 2 +-
git/tree.go        | 2 +-
git/types.go       | 2 +-
pkg/web/auth.go    | 4 ++--
pkg/web/context.go | 2 +-
pkg/web/git.go     | 2 +-
pkg/web/git_lfs.go | 2 +-
pkg/web/goget.go   | 2 +-
pkg/web/http.go    | 2 +-
pkg/web/logging.go | 4 ++--
pkg/web/server.go  | 2 +-
soft               | 0 
20 files changed, 21 insertions(+), 21 deletions(-)

Detailed changes

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

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.

git/errors.go

@@ -3,7 +3,7 @@ package git
 import (
 	"errors"
 
-	"github.com/aymanbagabas/git-module"
+	git "github.com/aymanbagabas/git-module"
 )
 
 var (

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"
 )

git/reference.go

@@ -3,7 +3,7 @@ package git
 import (
 	"strings"
 
-	"github.com/aymanbagabas/git-module"
+	git "github.com/aymanbagabas/git-module"
 )
 
 const (

git/repo.go

@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/aymanbagabas/git-module"
+	git "github.com/aymanbagabas/git-module"
 )
 
 var (

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.

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) {

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

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.

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

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.

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"

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"

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"

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"

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"
 )
 

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

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"
 )

soft