Merge pull request #556 from github/grokys/allow-canonical-refs

Allow canonical refs in SetTrackingBranch.

Author: shana

src/GitHub.App/Services/GitClient.cs

@@ -83,12 +83,12 @@ public IObservable<Unit> SetTrackingBranch(IRepository repository, string branch
 
             return Observable.Defer(() =>
             {
-                var remoteBranchName = "refs/remotes/" + remoteName + "/" + branchName;
+                var remoteBranchName = IsCanonical(remoteName) ? remoteName : "refs/remotes/" + remoteName + "/" + branchName;
                 var remoteBranch = repository.Branches[remoteBranchName];
                 // if it's null, it's because nothing was pushed
                 if (remoteBranch != null)
                 {
-                    var localBranchName = "refs/heads/" + branchName;
+                    var localBranchName = IsCanonical(branchName) ? branchName : "refs/heads/" + branchName;
                     var localBranch = repository.Branches[localBranchName];
                     repository.Branches.Update(localBranch, b => b.TrackedBranch = remoteBranch.CanonicalName);
                 }
@@ -108,5 +108,10 @@ public IObservable<Remote> GetHttpRemote(IRepository repo, string remote)
                     return ret;
                 });
         }
+
+        static bool IsCanonical(string s)
+        {
+            return s.StartsWith("refs/", StringComparison.Ordinal);
+        }
     }
 }

src/GitHub.Exports.Reactive/Services/IGitClient.cs

@@ -45,8 +45,8 @@ public interface IGitClient
         /// Sets the remote branch that the local branch tracks
         /// </summary>
         /// <param name="repository">The repository to set</param>
-        /// <param name="branchName">The name of the remote</param>
-        /// <param name="remoteName">The name of the branch (local and remote)</param>
+        /// <param name="branchName">The name of the local remote</param>
+        /// <param name="remoteName">The name of the remote branch</param>
         /// <returns></returns>
         IObservable<Unit> SetTrackingBranch(IRepository repository, string branchName, string remoteName);