Update exception message when Pull cannot find ref to merge

jamill · jamill · commit e26389801de2 · 2014-10-08T17:04:17.000-04:00
diff --git a/LibGit2Sharp.Tests/NetworkFixture.cs b/LibGit2Sharp.Tests/NetworkFixture.cs
@@ -196,6 +196,38 @@ public void CanPullIntoEmptyRepo()
             }
         }
 
+        [Fact]
+        public void PullWithoutMergeBranchThrows()
+        {
+            var scd = BuildSelfCleaningDirectory();
+            string clonedRepoPath = Repository.Clone(StandardTestRepoPath, scd.DirectoryPath);
+
+            using (var repo = new Repository(clonedRepoPath))
+            {
+                Branch branch = repo.Branches["master"];
+
+                // Update the Upstream merge branch
+                repo.Branches.Update(branch,
+                    b => b.UpstreamBranch = "refs/heads/another_master");
+
+                bool didPullThrow = false;
+                MergeFetchHeadNotFoundException thrownException = null;
+
+                try
+                {
+                    repo.Network.Pull(Constants.Signature, new PullOptions());
+                }
+                catch(MergeFetchHeadNotFoundException ex)
+                {
+                    didPullThrow = true;
+                    thrownException = ex;
+                }
+
+                Assert.True(didPullThrow, "Pull did not throw.");
+                Assert.True(thrownException.Message.Contains("refs/heads/another_master"), "Exception message did not contain expected reference.");
+            }
+        }
+
         /*
         * git ls-remote http://github.com/libgit2/TestGitRepository
         * 49322bb17d3acc9146f98c97d078513228bbf3c0        HEAD
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -1032,7 +1032,9 @@ internal MergeResult MergeFetchHeads(Signature merger, MergeOptions options)
 
             if (fetchHeads.Length == 0)
             {
-                throw new MergeFetchHeadNotFoundException("The configured reference to merge with was not fetched from the remote.");
+                var expectedRef = this.Head.UpstreamBranchCanonicalName;
+                throw new MergeFetchHeadNotFoundException(string.Format(CultureInfo.InvariantCulture,
+                    "The current branch is configured to merge with the reference '{0}' from the remote, but this reference was not fetched.", expectedRef));
             }
 
             GitMergeHeadHandle[] mergeHeadHandles = fetchHeads.Select(fetchHead =>

Original file line number	Diff line number	Diff line change
`@@ -1032,7 +1032,9 @@ internal MergeResult MergeFetchHeads(Signature merger, MergeOptions options)`
`1032`	`1032`
`1033`	`1033`	`if (fetchHeads.Length == 0)`
`1034`	`1034`	`{`
`1035`		`- throw new MergeFetchHeadNotFoundException("The configured reference to merge with was not fetched from the remote.");`
	`1035`	`+ var expectedRef = this.Head.UpstreamBranchCanonicalName;`
	`1036`	`+ throw new MergeFetchHeadNotFoundException(string.Format(CultureInfo.InvariantCulture,`
	`1037`	`+ "The current branch is configured to merge with the reference '{0}' from the remote, but this reference was not fetched.", expectedRef));`
`1036`	`1038`	`}`
`1037`	`1039`
`1038`	`1040`	`GitMergeHeadHandle[] mergeHeadHandles = fetchHeads.Select(fetchHead =>`