From 03ba1abb0c6f40604193f8abdf6e29f28e779129 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
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 eb4f0d17a..4508d49ae 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 20f2050d4..e833c8a7f 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 40b0d390f..b77e9bfb2 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 d166390cb..9e8735b8c 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 47aceb95b..e634dd42d 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 b71abd1cf..382f07ee0 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 e868b1a29..e85368145 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 0a669ddd3..05e1b0992 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 f09d39a25..d276ec685 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 1828b9cb2..d5fbe96f7 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 daf89b03e..44bad80a8 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 fbea59e8b..30cc37a5e 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 1194cd0ac..e0a5520fc 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 8baa54a32..e3d3d485a 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 da155203a..344ed43cb 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 1bc008923..2a512159d 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 cd7b2411e..828e81bae 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 b1d524565..deb670a31 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 7c095a019..128c5b5d1 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 ce27a1f7c..30bb5be3d 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.