Fix TrackedBranch property on DetachedHead branches

dahlbyk · dahlbyk · commit 30b554cdc5e3 · 2012-12-05T21:46:03.000-06:00
diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/LibGit2Sharp.Tests/BranchFixture.cs
@@ -594,6 +594,7 @@ public void DetachedHeadIsNotATrackingBranch()
                 repo.Checkout(headSha);
 
                 Assert.False(repo.Head.IsTracking);
+                Assert.Null(repo.Head.TrackedBranch);
             }
         }
     }
diff --git a/LibGit2Sharp/DetachedHead.cs b/LibGit2Sharp/DetachedHead.cs
@@ -13,14 +13,11 @@ protected override string Shorten(string branchName)
         }
 
         /// <summary>
-        ///   Determines if this local branch is connected to a remote one.
+        ///   Gets the remote branch which is connected to this local one, or null if there is none.
         /// </summary>
-        public override bool IsTracking
+        public override Branch TrackedBranch
         {
-            get
-            {
-                return false;
-            }
+            get { return null; }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -594,6 +594,7 @@ public void DetachedHeadIsNotATrackingBranch()`
`594`	`594`	`repo.Checkout(headSha);`
`595`	`595`
`596`	`596`	`Assert.False(repo.Head.IsTracking);`
	`597`	`+ Assert.Null(repo.Head.TrackedBranch);`
`597`	`598`	`}`
`598`	`599`	`}`
`599`	`600`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,11 @@ protected override string Shorten(string branchName)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/// <summary>`
`16`		`- /// Determines if this local branch is connected to a remote one.`
	`16`	`+ /// Gets the remote branch which is connected to this local one, or null if there is none.`
`17`	`17`	`/// </summary>`
`18`		`- public override bool IsTracking`
	`18`	`+ public override Branch TrackedBranch`
`19`	`19`	`{`
`20`		`- get`
`21`		`- {`
`22`		`- return false;`
`23`		`- }`
	`20`	`+ get { return null; }`
`24`	`21`	`}`
`25`	`22`	`}`
`26`	`23`	`}`