Prioritize upstream remote over origin

Fixes #28.

1 files changed, 10 insertions, 1 deletions

diff --git a/git.go b/git.go
index 8191673..8550830 100644
--- a/git.go
+++ b/git.go
@@ -16,6 +16,11 @@ import (
 	"github.com/muesli/gitty/vcs/gitlab"
 )
 
+const (
+	originRemote   = "origin"
+	upstreamRemote = "upstream"
+)
+
 // Client defines the set of methods required from a git provider.
 type Client interface {
 	Issues(owner string, name string) ([]vcs.Issue, error)
@@ -114,11 +119,15 @@ func remoteURL(path string) (string, string, error) {
 	var u string
 	var rn string
 	for _, v := range remotes {
-		if (v.Config().Name == "origin" && rn != "origin") ||
+		if (v.Config().Name == upstreamRemote && rn != upstreamRemote) ||
 			rn == "" {
 			rn = v.Config().Name
 			u = v.Config().URLs[0]
 		}
+		if v.Config().Name == originRemote && rn != originRemote && rn != upstreamRemote {
+			rn = v.Config().Name
+			u = v.Config().URLs[0]
+		}
 	}
 
 	if u == "" {