From 03ba1abb0c6f40604193f8abdf6e29f28e779129 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Wed, 1 Nov 2023 11:46:56 -0400 Subject: [PATCH] fix(gomod): use git-module fork --- 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 +- go.mod | 4 +--- go.sum | 4 ++-- 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 +- 20 files changed, 21 insertions(+), 23 deletions(-) diff --git a/git/command.go b/git/command.go index eb4f0d17ac5af0c7313cd200244a2bac36c04c13..4508d49ae959c4ee72695111dcdc6e40bc575af4 100644 --- a/git/command.go +++ b/git/command.go @@ -1,6 +1,6 @@ package git -import "github.com/gogs/git-module" +import "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 20f2050d49475cd0d5d1258fd1f9e1f7f95d6785..e833c8a7f3647e34a59b5125b9f7732da9a37203 100644 --- a/git/commit.go +++ b/git/commit.go @@ -3,7 +3,7 @@ package git import ( "regexp" - "github.com/gogs/git-module" + "github.com/aymanbagabas/git-module" ) // ZeroID is the zero hash. diff --git a/git/errors.go b/git/errors.go index 40b0d390f3603c5168c9a4318229f8444869be44..b77e9bfb2d8962301014dead00dbbbe09741215a 100644 --- a/git/errors.go +++ b/git/errors.go @@ -3,7 +3,7 @@ package git import ( "errors" - "github.com/gogs/git-module" + "github.com/aymanbagabas/git-module" ) var ( diff --git a/git/patch.go b/git/patch.go index d166390cbef50227d022ed56ee144acaff0116c6..9e8735b8c27baa050f1e85338eaf301bb019a567 100644 --- a/git/patch.go +++ b/git/patch.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/dustin/go-humanize/english" - "github.com/gogs/git-module" + "github.com/aymanbagabas/git-module" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/git/reference.go b/git/reference.go index 47aceb95bbbec2577195fbf58512d0dd6adaa2be..e634dd42d2b9e8419012ae4b713c7d230d4e78d7 100644 --- a/git/reference.go +++ b/git/reference.go @@ -3,7 +3,7 @@ package git import ( "strings" - "github.com/gogs/git-module" + "github.com/aymanbagabas/git-module" ) const ( diff --git a/git/repo.go b/git/repo.go index b71abd1cffd4929c11bb755e59e286a0f7e08e96..382f07ee0df1b9d0e2df26940ec37b8cf4b1a4e4 100644 --- a/git/repo.go +++ b/git/repo.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/gogs/git-module" + "github.com/aymanbagabas/git-module" ) var ( diff --git a/git/server.go b/git/server.go index e868b1a29fd018edaeb54c88c84c7dd8655ef9c9..e853681451c6162744d22557da3d78ca30c8fe05 100644 --- a/git/server.go +++ b/git/server.go @@ -3,7 +3,7 @@ package git import ( "context" - "github.com/gogs/git-module" + "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 0a669ddd395c33f59cd6b66cf30dd8e9e4169fd1..05e1b09925f8560f22ac1c01ee47eb5dd503919f 100644 --- a/git/stash.go +++ b/git/stash.go @@ -1,6 +1,6 @@ package git -import "github.com/gogs/git-module" +import "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 f09d39a25a58c888d413734da5c53e5897254862..d276ec68543e5e2d469e37c9befc9eee6a3fd1b1 100644 --- a/git/tag.go +++ b/git/tag.go @@ -1,6 +1,6 @@ package git -import "github.com/gogs/git-module" +import "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 1828b9cb2ce02f4b8e64696ec4494f6542ab4dc9..d5fbe96f7a1582835b49c131f10b60a59bd44967 100644 --- a/git/tree.go +++ b/git/tree.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sort" - "github.com/gogs/git-module" + "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 daf89b03eead9808ef30154605faa288ce4a3e19..44bad80a8a1f7f362b3623a7ef5b5ead335dd6b4 100644 --- a/git/types.go +++ b/git/types.go @@ -1,6 +1,6 @@ package git -import "github.com/gogs/git-module" +import "github.com/aymanbagabas/git-module" // CommandOptions contain options for running a git command. type CommandOptions = git.CommandOptions diff --git a/go.mod b/go.mod index fbea59e8bf64b1c30e3391ad845774f68ddc9604..30cc37a5e9d449fde79f94ea7885e2e26219107b 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/charmbracelet/soft-serve go 1.20 -replace github.com/gogs/git-module => github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213 - require ( github.com/alecthomas/chroma v0.10.0 github.com/charmbracelet/bubbles v0.16.1 @@ -20,6 +18,7 @@ require ( ) require ( + github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 github.com/caarlos0/duration v0.0.0-20220103233809-8df7c22fe305 github.com/caarlos0/env/v10 v10.0.0 github.com/caarlos0/tablewriter v0.1.0 @@ -29,7 +28,6 @@ require ( github.com/charmbracelet/ssh v0.0.0-20230822194956-1a051f898e09 github.com/go-jose/go-jose/v3 v3.0.0 github.com/gobwas/glob v0.2.3 - github.com/gogs/git-module v1.8.3 github.com/golang-jwt/jwt/v5 v5.0.0 github.com/google/go-querystring v1.1.0 github.com/google/uuid v1.4.0 diff --git a/go.sum b/go.sum index 1194cd0ac1cb6402299e6f4a18e0398fa097c3f9..e0a5520fc88caa6dd5b544aa8b5b16ec0851b9b7 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213 h1:/tUfPeV5T/tn2UjvQedq1incFa9B9WkFHTv0fdt5Ah0= -github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213/go.mod h1:3OBxY2gWeblk83u6BlGMO1TYDEbV4bspATMP/S2Kfsk= +github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 h1:3w5KT+shE3hzWhORGiu2liVjEoaCEXm9uZP47+Gw4So= +github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2/go.mod h1:d4gQ7/3/S2sPq4NnKdtAgUOVr6XtLpWFtxyVV5/+76U= github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= diff --git a/pkg/git/git.go b/pkg/git/git.go index 8baa54a3282226b37e0bdfe8cae988bbf6274873..e3d3d485af754d042b07eb0e326661c94a079406 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -10,7 +10,7 @@ import ( "github.com/charmbracelet/log" "github.com/charmbracelet/soft-serve/git" "github.com/go-git/go-git/v5/plumbing/format/pktline" - gitm "github.com/gogs/git-module" + 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 da155203afd2accf76153ae36b255a01684252a3..344ed43cb27338cd383f26300022fa8ae505d987 100644 --- a/pkg/lfs/scanner.go +++ b/pkg/lfs/scanner.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/charmbracelet/soft-serve/git" - gitm "github.com/gogs/git-module" + gitm "github.com/aymanbagabas/git-module" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/pkg/ssh/cmd/branch.go b/pkg/ssh/cmd/branch.go index 1bc00892342b9d65d07ced35d60d5863aa7a9238..2a512159da23341d8c4e3ebc4f068d1e3b445a38 100644 --- a/pkg/ssh/cmd/branch.go +++ b/pkg/ssh/cmd/branch.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/charmbracelet/soft-serve/pkg/webhook" - gitm "github.com/gogs/git-module" + 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 cd7b2411e703b77e5c1cf7c2a06e20adb2da4bd7..828e81bae96a8a154e8ebfe32d2b93116230748d 100644 --- a/pkg/ui/pages/repo/files.go +++ b/pkg/ui/pages/repo/files.go @@ -15,7 +15,7 @@ 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/gogs/git-module" + 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 b1d524565797508e65dc73d4c8af7c0438e9b946..deb670a3173a138e4d8bc7509805844e5fd81ce6 100644 --- a/pkg/ui/pages/repo/stash.go +++ b/pkg/ui/pages/repo/stash.go @@ -12,7 +12,7 @@ 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/gogs/git-module" + 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 7c095a0194e19015805f7e5f77b0f2341d4dccdc..128c5b5d19ea37864eddbea48e881a081a74d25b 100644 --- a/pkg/ui/pages/repo/stashitem.go +++ b/pkg/ui/pages/repo/stashitem.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/soft-serve/pkg/ui/common" - gitm "github.com/gogs/git-module" + gitm "github.com/aymanbagabas/git-module" ) // StashItem represents a stash item. diff --git a/pkg/webhook/push.go b/pkg/webhook/push.go index ce27a1f7c4b9070d060d272bb103d790592aa67d..30bb5be3def8008cfe97590ba74764d2ad8f6a1a 100644 --- a/pkg/webhook/push.go +++ b/pkg/webhook/push.go @@ -9,7 +9,7 @@ import ( "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/charmbracelet/soft-serve/pkg/store" - gitm "github.com/gogs/git-module" + gitm "github.com/aymanbagabas/git-module" ) // PushEvent is a push event.