Diff
1diff --git a/git/patch.go b/git/patch.go
2index 9e8735b8c27baa050f1e85338eaf301bb019a567..ad8d98255eabd255fb0d0e403d2eec21dfb81860 100644
3--- a/git/patch.go
4+++ b/git/patch.go
5@@ -7,8 +7,8 @@ import (
6 "strings"
7 "sync"
8
9- "github.com/dustin/go-humanize/english"
10 "github.com/aymanbagabas/git-module"
11+ "github.com/dustin/go-humanize/english"
12 "github.com/sergi/go-diff/diffmatchpatch"
13 )
14
15diff --git a/pkg/git/git.go b/pkg/git/git.go
16index e3d3d485af754d042b07eb0e326661c94a079406..e523b90a279dde5590614f20c419b24a135aa42d 100644
17--- a/pkg/git/git.go
18+++ b/pkg/git/git.go
19@@ -7,10 +7,10 @@ import (
20 "path/filepath"
21 "strings"
22
23+ gitm "github.com/aymanbagabas/git-module"
24 "github.com/charmbracelet/log"
25 "github.com/charmbracelet/soft-serve/git"
26 "github.com/go-git/go-git/v5/plumbing/format/pktline"
27- gitm "github.com/aymanbagabas/git-module"
28 )
29
30 // WritePktline encodes and writes a pktline to the given writer.
31diff --git a/pkg/lfs/scanner.go b/pkg/lfs/scanner.go
32index 344ed43cb27338cd383f26300022fa8ae505d987..6cd19691fae22c5f96da572b97d93c4c6109571f 100644
33--- a/pkg/lfs/scanner.go
34+++ b/pkg/lfs/scanner.go
35@@ -10,8 +10,8 @@ import (
36 "strings"
37 "sync"
38
39- "github.com/charmbracelet/soft-serve/git"
40 gitm "github.com/aymanbagabas/git-module"
41+ "github.com/charmbracelet/soft-serve/git"
42 )
43
44 // SearchPointerBlobs scans the whole repository for LFS pointer files
45diff --git a/pkg/ssh/cmd/branch.go b/pkg/ssh/cmd/branch.go
46index 2a512159da23341d8c4e3ebc4f068d1e3b445a38..c43ce974f69d6d117d2e80bb91d580f578f6e928 100644
47--- a/pkg/ssh/cmd/branch.go
48+++ b/pkg/ssh/cmd/branch.go
49@@ -4,11 +4,11 @@ import (
50 "fmt"
51 "strings"
52
53+ gitm "github.com/aymanbagabas/git-module"
54 "github.com/charmbracelet/soft-serve/git"
55 "github.com/charmbracelet/soft-serve/pkg/backend"
56 "github.com/charmbracelet/soft-serve/pkg/proto"
57 "github.com/charmbracelet/soft-serve/pkg/webhook"
58- gitm "github.com/aymanbagabas/git-module"
59 "github.com/spf13/cobra"
60 )
61
62diff --git a/pkg/ui/pages/repo/files.go b/pkg/ui/pages/repo/files.go
63index 828e81bae96a8a154e8ebfe32d2b93116230748d..4d55853648b37ee5abd11029cebe33499cb82731 100644
64--- a/pkg/ui/pages/repo/files.go
65+++ b/pkg/ui/pages/repo/files.go
66@@ -7,6 +7,7 @@ import (
67 "strings"
68
69 "github.com/alecthomas/chroma/lexers"
70+ gitm "github.com/aymanbagabas/git-module"
71 "github.com/charmbracelet/bubbles/key"
72 "github.com/charmbracelet/bubbles/spinner"
73 tea "github.com/charmbracelet/bubbletea"
74@@ -15,7 +16,6 @@ import (
75 "github.com/charmbracelet/soft-serve/pkg/ui/common"
76 "github.com/charmbracelet/soft-serve/pkg/ui/components/code"
77 "github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
78- gitm "github.com/aymanbagabas/git-module"
79 )
80
81 type filesView int
82diff --git a/pkg/ui/pages/repo/stash.go b/pkg/ui/pages/repo/stash.go
83index deb670a3173a138e4d8bc7509805844e5fd81ce6..2d1fa69ff6d2e6ea805d4c3d517889312d49819b 100644
84--- a/pkg/ui/pages/repo/stash.go
85+++ b/pkg/ui/pages/repo/stash.go
86@@ -3,6 +3,7 @@ package repo
87 import (
88 "fmt"
89
90+ gitm "github.com/aymanbagabas/git-module"
91 "github.com/charmbracelet/bubbles/key"
92 "github.com/charmbracelet/bubbles/spinner"
93 tea "github.com/charmbracelet/bubbletea"
94@@ -12,7 +13,6 @@ import (
95 "github.com/charmbracelet/soft-serve/pkg/ui/common"
96 "github.com/charmbracelet/soft-serve/pkg/ui/components/code"
97 "github.com/charmbracelet/soft-serve/pkg/ui/components/selector"
98- gitm "github.com/aymanbagabas/git-module"
99 )
100
101 type stashState int
102diff --git a/pkg/ui/pages/repo/stashitem.go b/pkg/ui/pages/repo/stashitem.go
103index 128c5b5d19ea37864eddbea48e881a081a74d25b..cc2d3f3a0f107bad5642452a88e5ce53ab6e1b7b 100644
104--- a/pkg/ui/pages/repo/stashitem.go
105+++ b/pkg/ui/pages/repo/stashitem.go
106@@ -4,11 +4,11 @@ import (
107 "fmt"
108 "io"
109
110+ gitm "github.com/aymanbagabas/git-module"
111 "github.com/charmbracelet/bubbles/key"
112 "github.com/charmbracelet/bubbles/list"
113 tea "github.com/charmbracelet/bubbletea"
114 "github.com/charmbracelet/soft-serve/pkg/ui/common"
115- gitm "github.com/aymanbagabas/git-module"
116 )
117
118 // StashItem represents a stash item.
119diff --git a/pkg/webhook/push.go b/pkg/webhook/push.go
120index 30bb5be3def8008cfe97590ba74764d2ad8f6a1a..8af2c13982fcfa24f3e9e0168bd7ba857efa3bf6 100644
121--- a/pkg/webhook/push.go
122+++ b/pkg/webhook/push.go
123@@ -4,12 +4,12 @@ import (
124 "context"
125 "fmt"
126
127+ gitm "github.com/aymanbagabas/git-module"
128 "github.com/charmbracelet/soft-serve/git"
129 "github.com/charmbracelet/soft-serve/pkg/config"
130 "github.com/charmbracelet/soft-serve/pkg/db"
131 "github.com/charmbracelet/soft-serve/pkg/proto"
132 "github.com/charmbracelet/soft-serve/pkg/store"
133- gitm "github.com/aymanbagabas/git-module"
134 )
135
136 // PushEvent is a push event.