From 927eba00e0b47fa8b5601fa76ebcd9a90b2b2950 Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Thu, 8 Oct 2015 11:59:45 +0100
Subject: [PATCH] Refactor remote/ref derivation to allow for remotes with '/'
 in name

---
 git/git.go | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/git/git.go b/git/git.go
index f4ce8eef..c7a19f68 100644
--- a/git/git.go
+++ b/git/git.go
@@ -91,16 +91,18 @@ func CurrentRemoteRef() (*Ref, error) {
 
 // RemoteForCurrentBranch returns the name of the remote that the current branch is tracking
 func RemoteForCurrentBranch() (string, error) {
-	ref, err := RemoteRefNameForCurrentBranch()
+	branch, err := CurrentBranch()
 	if err != nil {
 		return "", err
 	}
-	// ref name is full name, split first part for remote
-	parts := strings.Split(ref, "/")
-	return parts[0], nil
+	remote := RemoteForBranch(branch)
+	if remote == "" {
+		return "", errors.New("remote not found")
+	}
+	return remote, nil
 }
 
-// RemoteRefForCurrentBranch returns the string remote ref that the current branch is tracking
+// RemoteRefForCurrentBranch returns the full remote ref (remote/remotebranch) that the current branch is tracking
 func RemoteRefNameForCurrentBranch() (string, error) {
 	branch, err := CurrentBranch()
 	if err != nil {
@@ -111,20 +113,32 @@ func RemoteRefNameForCurrentBranch() (string, error) {
 		return "", errors.New("not on a branch")
 	}
 
-	remote := Config.Find(fmt.Sprintf("branch.%s.remote", branch))
+	remote := RemoteForBranch(branch)
 	if remote == "" {
 		return "", errors.New("remote not found")
 	}
 
+	remotebranch := RemoteBranchForLocalBranch(branch)
+
+	return remote + "/" + remotebranch, nil
+}
+
+// RemoteForBranch returns the remote name that a given local branch is tracking (blank if none)
+func RemoteForBranch(localBranch string) string {
+	return Config.Find(fmt.Sprintf("branch.%s.remote", localBranch))
+}
+
+// RemoteBranchForLocalBranch returns the name (only) of the remote branch that the local branch is tracking
+// If no specific branch is configured, returns local branch name
+func RemoteBranchForLocalBranch(localBranch string) string {
 	// get remote ref to track, may not be same name
-	merge := Config.Find(fmt.Sprintf("branch.%s.merge", branch))
+	merge := Config.Find(fmt.Sprintf("branch.%s.merge", localBranch))
 	if strings.HasPrefix(merge, "refs/heads/") {
-		merge = merge[11:]
+		return merge[11:]
 	} else {
-		merge = branch
+		return localBranch
 	}
 
-	return remote + "/" + merge, nil
 }
 
 func RemoteList() ([]string, error) {