Don't resolve SymRef Target to direct

dahlbyk · dahlbyk · commit d1b00f701024 · 2013-08-30T21:36:42.000-05:00
diff --git a/LibGit2Sharp.Tests/ReferenceFixture.cs b/LibGit2Sharp.Tests/ReferenceFixture.cs
@@ -738,15 +738,16 @@ public void CanTellIfAReferenceIsValid(string refname, bool expectedResult)
         [Fact]
         public void CanUpdateTheTargetOfASymbolicReferenceWithAnotherSymbolicReference()
         {
-            string repoPath = InitNewRepository();
+            string repoPath = CloneBareTestRepo();
 
             using (var repo = new Repository(repoPath))
             {
                 Reference symbolicRef = repo.Refs.Add("refs/heads/unit_test", "refs/heads/master");
 
                 Reference newHead = repo.Refs.UpdateTarget(repo.Refs.Head, symbolicRef);
-                Assert.IsType<SymbolicReference>(newHead);
+                var symbolicHead = Assert.IsType<SymbolicReference>(newHead);
                 Assert.Equal(symbolicRef.CanonicalName, newHead.TargetIdentifier);
+                Assert.Equal(symbolicRef, symbolicHead.Target);
             }
         }
 
diff --git a/LibGit2Sharp/Reference.cs b/LibGit2Sharp/Reference.cs
@@ -47,18 +47,9 @@ internal static T BuildFromPtr<T>(ReferenceSafeHandle handle, Repository repo) w
                 case GitReferenceType.Symbolic:
                     string targetIdentifier = Proxy.git_reference_symbolic_target(handle);
 
-                    using (ReferenceSafeHandle resolvedHandle = Proxy.git_reference_resolve(handle))
-                    {
-                        if (resolvedHandle == null)
-                        {
-                            reference = new SymbolicReference(name, targetIdentifier, null);
-                            break;
-                        }
-
-                        var targetRef = BuildFromPtr<DirectReference>(resolvedHandle, repo);
-                        reference = new SymbolicReference(name, targetIdentifier, targetRef);
-                        break;
-                    }
+                    var targetRef = repo.Refs[targetIdentifier];
+                    reference = new SymbolicReference(name, targetIdentifier, targetRef);
+                    break;
 
                 case GitReferenceType.Oid:
                     ObjectId targetOid = Proxy.git_reference_target(handle);

Original file line number	Diff line number	Diff line change
`@@ -738,15 +738,16 @@ public void CanTellIfAReferenceIsValid(string refname, bool expectedResult)`
`738`	`738`	`[Fact]`
`739`	`739`	`public void CanUpdateTheTargetOfASymbolicReferenceWithAnotherSymbolicReference()`
`740`	`740`	`{`
`741`		`- string repoPath = InitNewRepository();`
	`741`	`+ string repoPath = CloneBareTestRepo();`
`742`	`742`
`743`	`743`	`using (var repo = new Repository(repoPath))`
`744`	`744`	`{`
`745`	`745`	`Reference symbolicRef = repo.Refs.Add("refs/heads/unit_test", "refs/heads/master");`
`746`	`746`
`747`	`747`	`Reference newHead = repo.Refs.UpdateTarget(repo.Refs.Head, symbolicRef);`
`748`		`- Assert.IsType<SymbolicReference>(newHead);`
	`748`	`+ var symbolicHead = Assert.IsType<SymbolicReference>(newHead);`
`749`	`749`	`Assert.Equal(symbolicRef.CanonicalName, newHead.TargetIdentifier);`
	`750`	`+ Assert.Equal(symbolicRef, symbolicHead.Target);`
`750`	`751`	`}`
`751`	`752`	`}`
`752`	`753`