From 7113ed73d4d776f0a0f19e715a717e0394ac3651 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 26 Nov 2019 21:29:56 +1100 Subject: support older versions of git when getting remote branches --- pkg/commands/loading_remotes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/commands/loading_remotes.go b/pkg/commands/loading_remotes.go index a56e8571a..26dea0f70 100644 --- a/pkg/commands/loading_remotes.go +++ b/pkg/commands/loading_remotes.go @@ -9,7 +9,7 @@ import ( func (c *GitCommand) GetRemotes() ([]*Remote, error) { // get remote branches - unescaped := "git for-each-ref --format='%(refname:strip=2)' refs/remotes" + unescaped := "git branch -r" remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped) if err != nil { return nil, err @@ -25,7 +25,7 @@ func (c *GitCommand) GetRemotes() ([]*Remote, error) { for i, goGitRemote := range goGitRemotes { remoteName := goGitRemote.Config().Name - re := regexp.MustCompile(fmt.Sprintf("%s\\/(.*)", remoteName)) + re := regexp.MustCompile(fmt.Sprintf(`%s\/([\S]+)`, remoteName)) matches := re.FindAllStringSubmatch(remoteBranchesStr, -1) branches := make([]*RemoteBranch, len(matches)) for j, match := range matches { -- cgit v1.2.3