1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
Description: Use original go-git instead of fork
Upstream uses fork. and we use the original version, which is already in
Debian. There is no API conflicts.
Author: Jongmin Kim <jmkim@debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pkg/commands/git_commands/branch_loader.go
+++ b/pkg/commands/git_commands/branch_loader.go
@@ -9,7 +9,7 @@
"time"
"github.com/jesseduffield/generics/set"
- "github.com/jesseduffield/go-git/v5/config"
+ "github.com/go-git/go-git/v5/config"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/common"
--- a/pkg/commands/git_commands/common.go
+++ b/pkg/commands/git_commands/common.go
@@ -1,7 +1,7 @@
package git_commands
import (
- gogit "github.com/jesseduffield/go-git/v5"
+ gogit "github.com/go-git/go-git/v5"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/common"
)
--- a/pkg/commands/git_commands/config.go
+++ b/pkg/commands/git_commands/config.go
@@ -5,8 +5,8 @@
"strconv"
"strings"
- gogit "github.com/jesseduffield/go-git/v5"
- "github.com/jesseduffield/go-git/v5/config"
+ gogit "github.com/go-git/go-git/v5"
+ "github.com/go-git/go-git/v5/config"
"github.com/jesseduffield/lazygit/pkg/commands/git_config"
"github.com/jesseduffield/lazygit/pkg/common"
"github.com/jesseduffield/lazygit/pkg/utils"
--- a/pkg/commands/git_commands/deps_test.go
+++ b/pkg/commands/git_commands/deps_test.go
@@ -4,7 +4,7 @@
"os"
"github.com/go-errors/errors"
- gogit "github.com/jesseduffield/go-git/v5"
+ gogit "github.com/go-git/go-git/v5"
"github.com/jesseduffield/lazygit/pkg/commands/git_config"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/common"
--- a/pkg/commands/git_commands/remote_loader.go
+++ b/pkg/commands/git_commands/remote_loader.go
@@ -6,7 +6,7 @@
"strings"
"sync"
- gogit "github.com/jesseduffield/go-git/v5"
+ gogit "github.com/go-git/go-git/v5"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/common"
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -6,7 +6,7 @@
"github.com/go-errors/errors"
- gogit "github.com/jesseduffield/go-git/v5"
+ gogit "github.com/go-git/go-git/v5"
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
"github.com/jesseduffield/lazygit/pkg/commands/git_config"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
