sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

support older versions of git when getting remote branches

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-26 21:29:56 +11:00
parent 3dd1daacdc
commit 7113ed73d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/loading_remotes.go
View File

@ -9,7 +9,7 @@ import (
func (c *GitCommand) GetRemotes() ([]*Remote, error) { func (c *GitCommand) GetRemotes() ([]*Remote, error) {
// get remote branches // get remote branches
unescaped := "git for-each-ref --format='%(refname:strip=2)' refs/remotes" unescaped := "git branch -r"
remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped) remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped)
if err != nil { if err != nil {
return nil, err return nil, err
@ -25,7 +25,7 @@ func (c *GitCommand) GetRemotes() ([]*Remote, error) {
for i, goGitRemote := range goGitRemotes { for i, goGitRemote := range goGitRemotes {
remoteName := goGitRemote.Config().Name remoteName := goGitRemote.Config().Name
re := regexp.MustCompile(fmt.Sprintf("%s\\/(.*)", remoteName)) re := regexp.MustCompile(fmt.Sprintf(`%s\/([\S]+)`, remoteName))
matches := re.FindAllStringSubmatch(remoteBranchesStr, -1) matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
branches := make([]*RemoteBranch, len(matches)) branches := make([]*RemoteBranch, len(matches))
for j, match := range matches { for j, match := range matches {