Diff
1diff --git a/git/command.go b/git/command.go
2index eb4f0d17ac5af0c7313cd200244a2bac36c04c13..4508d49ae959c4ee72695111dcdc6e40bc575af4 100644
3--- a/git/command.go
4+++ b/git/command.go
5@@ -1,6 +1,6 @@
6 package git
7
8-import "github.com/gogs/git-module"
9+import "github.com/aymanbagabas/git-module"
10
11 // RunInDirOptions are options for RunInDir.
12 type RunInDirOptions = git.RunInDirOptions
13diff --git a/git/commit.go b/git/commit.go
14index 20f2050d49475cd0d5d1258fd1f9e1f7f95d6785..e833c8a7f3647e34a59b5125b9f7732da9a37203 100644
15--- a/git/commit.go
16+++ b/git/commit.go
17@@ -3,7 +3,7 @@ package git
18 import (
19 "regexp"
20
21- "github.com/gogs/git-module"
22+ "github.com/aymanbagabas/git-module"
23 )
24
25 // ZeroID is the zero hash.
26diff --git a/git/errors.go b/git/errors.go
27index 40b0d390f3603c5168c9a4318229f8444869be44..b77e9bfb2d8962301014dead00dbbbe09741215a 100644
28--- a/git/errors.go
29+++ b/git/errors.go
30@@ -3,7 +3,7 @@ package git
31 import (
32 "errors"
33
34- "github.com/gogs/git-module"
35+ "github.com/aymanbagabas/git-module"
36 )
37
38 var (
39diff --git a/git/patch.go b/git/patch.go
40index d166390cbef50227d022ed56ee144acaff0116c6..9e8735b8c27baa050f1e85338eaf301bb019a567 100644
41--- a/git/patch.go
42+++ b/git/patch.go
43@@ -8,7 +8,7 @@ import (
44 "sync"
45
46 "github.com/dustin/go-humanize/english"
47- "github.com/gogs/git-module"
48+ "github.com/aymanbagabas/git-module"
49 "github.com/sergi/go-diff/diffmatchpatch"
50 )
51
52diff --git a/git/reference.go b/git/reference.go
53index 47aceb95bbbec2577195fbf58512d0dd6adaa2be..e634dd42d2b9e8419012ae4b713c7d230d4e78d7 100644
54--- a/git/reference.go
55+++ b/git/reference.go
56@@ -3,7 +3,7 @@ package git
57 import (
58 "strings"
59
60- "github.com/gogs/git-module"
61+ "github.com/aymanbagabas/git-module"
62 )
63
64 const (
65diff --git a/git/repo.go b/git/repo.go
66index b71abd1cffd4929c11bb755e59e286a0f7e08e96..382f07ee0df1b9d0e2df26940ec37b8cf4b1a4e4 100644
67--- a/git/repo.go
68+++ b/git/repo.go
69@@ -4,7 +4,7 @@ import (
70 "path/filepath"
71 "strings"
72
73- "github.com/gogs/git-module"
74+ "github.com/aymanbagabas/git-module"
75 )
76
77 var (
78diff --git a/git/server.go b/git/server.go
79index e868b1a29fd018edaeb54c88c84c7dd8655ef9c9..e853681451c6162744d22557da3d78ca30c8fe05 100644
80--- a/git/server.go
81+++ b/git/server.go
82@@ -3,7 +3,7 @@ package git
83 import (
84 "context"
85
86- "github.com/gogs/git-module"
87+ "github.com/aymanbagabas/git-module"
88 )
89
90 // UpdateServerInfo updates the server info file for the given repo path.
91diff --git a/git/stash.go b/git/stash.go
92index 0a669ddd395c33f59cd6b66cf30dd8e9e4169fd1..05e1b09925f8560f22ac1c01ee47eb5dd503919f 100644
93--- a/git/stash.go
94+++ b/git/stash.go
95@@ -1,6 +1,6 @@
96 package git
97
98-import "github.com/gogs/git-module"
99+import "github.com/aymanbagabas/git-module"
100
101 // StashDiff returns the diff of the given stash index.
102 func (r *Repository) StashDiff(index int) (*Diff, error) {
103diff --git a/git/tag.go b/git/tag.go
104index f09d39a25a58c888d413734da5c53e5897254862..d276ec68543e5e2d469e37c9befc9eee6a3fd1b1 100644
105--- a/git/tag.go
106+++ b/git/tag.go
107@@ -1,6 +1,6 @@
108 package git
109
110-import "github.com/gogs/git-module"
111+import "github.com/aymanbagabas/git-module"
112
113 // Tag is a git tag.
114 type Tag = git.Tag
115diff --git a/git/tree.go b/git/tree.go
116index 1828b9cb2ce02f4b8e64696ec4494f6542ab4dc9..d5fbe96f7a1582835b49c131f10b60a59bd44967 100644
117--- a/git/tree.go
118+++ b/git/tree.go
119@@ -8,7 +8,7 @@ import (
120 "path/filepath"
121 "sort"
122
123- "github.com/gogs/git-module"
124+ "github.com/aymanbagabas/git-module"
125 )
126
127 // Tree is a wrapper around git.Tree with helper methods.
128diff --git a/git/types.go b/git/types.go
129index daf89b03eead9808ef30154605faa288ce4a3e19..44bad80a8a1f7f362b3623a7ef5b5ead335dd6b4 100644
130--- a/git/types.go
131+++ b/git/types.go
132@@ -1,6 +1,6 @@
133 package git
134
135-import "github.com/gogs/git-module"
136+import "github.com/aymanbagabas/git-module"
137
138 // CommandOptions contain options for running a git command.
139 type CommandOptions = git.CommandOptions
140diff --git a/go.mod b/go.mod
141index fbea59e8bf64b1c30e3391ad845774f68ddc9604..30cc37a5e9d449fde79f94ea7885e2e26219107b 100644
142--- a/go.mod
143+++ b/go.mod
144@@ -2,8 +2,6 @@ module github.com/charmbracelet/soft-serve
145
146 go 1.20
147
148-replace github.com/gogs/git-module => github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213
149-
150 require (
151 github.com/alecthomas/chroma v0.10.0
152 github.com/charmbracelet/bubbles v0.16.1
153@@ -20,6 +18,7 @@ require (
154 )
155
156 require (
157+ github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2
158 github.com/caarlos0/duration v0.0.0-20220103233809-8df7c22fe305
159 github.com/caarlos0/env/v10 v10.0.0
160 github.com/caarlos0/tablewriter v0.1.0
161@@ -29,7 +28,6 @@ require (
162 github.com/charmbracelet/ssh v0.0.0-20230822194956-1a051f898e09
163 github.com/go-jose/go-jose/v3 v3.0.0
164 github.com/gobwas/glob v0.2.3
165- github.com/gogs/git-module v1.8.3
166 github.com/golang-jwt/jwt/v5 v5.0.0
167 github.com/google/go-querystring v1.1.0
168 github.com/google/uuid v1.4.0
169diff --git a/go.sum b/go.sum
170index 1194cd0ac1cb6402299e6f4a18e0398fa097c3f9..e0a5520fc88caa6dd5b544aa8b5b16ec0851b9b7 100644
171--- a/go.sum
172+++ b/go.sum
173@@ -4,8 +4,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
174 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
175 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
176 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
177-github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213 h1:/tUfPeV5T/tn2UjvQedq1incFa9B9WkFHTv0fdt5Ah0=
178-github.com/aymanbagabas/git-module v1.4.1-0.20231025145308-5e8facf7a213/go.mod h1:3OBxY2gWeblk83u6BlGMO1TYDEbV4bspATMP/S2Kfsk=
179+github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 h1:3w5KT+shE3hzWhORGiu2liVjEoaCEXm9uZP47+Gw4So=
180+github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2/go.mod h1:d4gQ7/3/S2sPq4NnKdtAgUOVr6XtLpWFtxyVV5/+76U=
181 github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
182 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
183 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
184diff --git a/pkg/git/git.go b/pkg/git/git.go
185index 8baa54a3282226b37e0bdfe8cae988bbf6274873..e3d3d485af754d042b07eb0e326661c94a079406 100644
186--- a/pkg/git/git.go
187+++ b/pkg/git/git.go
188@@ -10,7 +10,7 @@ import (
189 "github.com/charmbracelet/log"
190 "github.com/charmbracelet/soft-serve/git"
191 "github.com/go-git/go-git/v5/plumbing/format/pktline"
192- gitm "github.com/gogs/git-module"
193+ gitm "github.com/aymanbagabas/git-module"
194 )
195
196 // WritePktline encodes and writes a pktline to the given writer.
197diff --git a/pkg/lfs/scanner.go b/pkg/lfs/scanner.go
198index da155203afd2accf76153ae36b255a01684252a3..344ed43cb27338cd383f26300022fa8ae505d987 100644
199--- a/pkg/lfs/scanner.go
200+++ b/pkg/lfs/scanner.go
201@@ -11,7 +11,7 @@ import (
202 "sync"
203
204 "github.com/charmbracelet/soft-serve/git"
205- gitm "github.com/gogs/git-module"
206+ gitm "github.com/aymanbagabas/git-module"
207 )
208
209 // SearchPointerBlobs scans the whole repository for LFS pointer files
210diff --git a/pkg/ssh/cmd/branch.go b/pkg/ssh/cmd/branch.go
211index 1bc00892342b9d65d07ced35d60d5863aa7a9238..2a512159da23341d8c4e3ebc4f068d1e3b445a38 100644
212--- a/pkg/ssh/cmd/branch.go
213+++ b/pkg/ssh/cmd/branch.go
214@@ -8,7 +8,7 @@ import (
215 "github.com/charmbracelet/soft-serve/pkg/backend"
216 "github.com/charmbracelet/soft-serve/pkg/proto"
217 "github.com/charmbracelet/soft-serve/pkg/webhook"
218- gitm "github.com/gogs/git-module"
219+ gitm "github.com/aymanbagabas/git-module"
220 "github.com/spf13/cobra"
221 )
222
223diff --git a/pkg/ui/pages/repo/files.go b/pkg/ui/pages/repo/files.go
224index cd7b2411e703b77e5c1cf7c2a06e20adb2da4bd7..828e81bae96a8a154e8ebfe32d2b93116230748d 100644
225--- a/pkg/ui/pages/repo/files.go
226+++ b/pkg/ui/pages/repo/files.go
227@@ -15,7 +15,7 @@ import (
228 "github.com/charmbracelet/soft-serve/pkg/ui/common"
229 "github.com/charmbracelet/soft-serve/pkg/ui/components/code"
230 "github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
231- gitm "github.com/gogs/git-module"
232+ gitm "github.com/aymanbagabas/git-module"
233 )
234
235 type filesView int
236diff --git a/pkg/ui/pages/repo/stash.go b/pkg/ui/pages/repo/stash.go
237index b1d524565797508e65dc73d4c8af7c0438e9b946..deb670a3173a138e4d8bc7509805844e5fd81ce6 100644
238--- a/pkg/ui/pages/repo/stash.go
239+++ b/pkg/ui/pages/repo/stash.go
240@@ -12,7 +12,7 @@ import (
241 "github.com/charmbracelet/soft-serve/pkg/ui/common"
242 "github.com/charmbracelet/soft-serve/pkg/ui/components/code"
243 "github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
244- gitm "github.com/gogs/git-module"
245+ gitm "github.com/aymanbagabas/git-module"
246 )
247
248 type stashState int
249diff --git a/pkg/ui/pages/repo/stashitem.go b/pkg/ui/pages/repo/stashitem.go
250index 7c095a0194e19015805f7e5f77b0f2341d4dccdc..128c5b5d19ea37864eddbea48e881a081a74d25b 100644
251--- a/pkg/ui/pages/repo/stashitem.go
252+++ b/pkg/ui/pages/repo/stashitem.go
253@@ -8,7 +8,7 @@ import (
254 "github.com/charmbracelet/bubbles/list"
255 tea "github.com/charmbracelet/bubbletea"
256 "github.com/charmbracelet/soft-serve/pkg/ui/common"
257- gitm "github.com/gogs/git-module"
258+ gitm "github.com/aymanbagabas/git-module"
259 )
260
261 // StashItem represents a stash item.
262diff --git a/pkg/webhook/push.go b/pkg/webhook/push.go
263index ce27a1f7c4b9070d060d272bb103d790592aa67d..30bb5be3def8008cfe97590ba74764d2ad8f6a1a 100644
264--- a/pkg/webhook/push.go
265+++ b/pkg/webhook/push.go
266@@ -9,7 +9,7 @@ import (
267 "github.com/charmbracelet/soft-serve/pkg/db"
268 "github.com/charmbracelet/soft-serve/pkg/proto"
269 "github.com/charmbracelet/soft-serve/pkg/store"
270- gitm "github.com/gogs/git-module"
271+ gitm "github.com/aymanbagabas/git-module"
272 )
273
274 // PushEvent is a push event.