Prevent Repository.Head.IsCurrentRepositoryHead from throwing a NullReferenceException when the Repository is empty

nulltoken · nulltoken · commit 839c659c35d8 · 2012-02-01T20:20:43.000+01:00
Fix issue libgit2#105
diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/LibGit2Sharp.Tests/BranchFixture.cs
@@ -316,10 +316,11 @@ public void CanCheckoutAnArbitraryCommit(string commitPointer)
                 detachedHead.CanonicalName.ShouldEqual("(no branch)");
                 detachedHead.Tip.Sha.ShouldEqual(repo.Lookup(commitPointer).Sha);
 
-                detachedHead.IsCurrentRepositoryHead.ShouldBeTrue();
                 detachedHead.ShouldEqual(repo.Head);
 
                 master.IsCurrentRepositoryHead.ShouldBeFalse();
+                detachedHead.IsCurrentRepositoryHead.ShouldBeTrue();
+                repo.Head.IsCurrentRepositoryHead.ShouldBeTrue();
             }
         }
 
diff --git a/LibGit2Sharp.Tests/RepositoryFixture.cs b/LibGit2Sharp.Tests/RepositoryFixture.cs
@@ -99,6 +99,7 @@ private static void AssertInitializedRepository(Repository repo)
             headRef.ResolveToDirectReference().ShouldBeNull();
 
             repo.Head.ShouldNotBeNull();
+            repo.Head.IsCurrentRepositoryHead.ShouldBeTrue();
             repo.Head.CanonicalName.ShouldEqual(headRef.TargetIdentifier);
             repo.Head.Tip.ShouldBeNull();
 
diff --git a/LibGit2Sharp/Branch.cs b/LibGit2Sharp/Branch.cs
@@ -111,11 +111,11 @@ public int BehindBy
         ///   Gets a value indicating whether this instance is current branch (HEAD) in the repository.
         /// </summary>
         /// <value>
-        ///   <c>true</c> if this instance is current branch; otherwise, <c>false</c>.
+        ///   <c>true</c> if this instance is the current branch; otherwise, <c>false</c>.
         /// </value>
-        public virtual bool IsCurrentRepositoryHead
+        public bool IsCurrentRepositoryHead
         {
-            get { return repo.Refs[CanonicalName].ResolveToDirectReference() == repo.Refs["HEAD"].ResolveToDirectReference(); }
+            get { return repo.Head == this; }
         }
 
         /// <summary>
diff --git a/LibGit2Sharp/DetachedHead.cs b/LibGit2Sharp/DetachedHead.cs
@@ -7,20 +7,6 @@ internal DetachedHead(Repository repo, Reference reference)
         {
         }
 
-        /// <summary>
-        ///   Gets a value indicating whether this instance is current branch (HEAD) in the repository.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if this instance is current branch; otherwise, <c>false</c>.
-        /// </value>
-        public override bool IsCurrentRepositoryHead
-        {
-            get
-            {
-                return repo.Head == this;
-            }
-        }
-
         protected override string Shorten(string branchName)
         {
             return branchName;

Original file line number	Diff line number	Diff line change
`@@ -316,10 +316,11 @@ public void CanCheckoutAnArbitraryCommit(string commitPointer)`
`316`	`316`	`detachedHead.CanonicalName.ShouldEqual("(no branch)");`
`317`	`317`	`detachedHead.Tip.Sha.ShouldEqual(repo.Lookup(commitPointer).Sha);`
`318`	`318`
`319`		`- detachedHead.IsCurrentRepositoryHead.ShouldBeTrue();`
`320`	`319`	`detachedHead.ShouldEqual(repo.Head);`
`321`	`320`
`322`	`321`	`master.IsCurrentRepositoryHead.ShouldBeFalse();`
	`322`	`+ detachedHead.IsCurrentRepositoryHead.ShouldBeTrue();`
	`323`	`+ repo.Head.IsCurrentRepositoryHead.ShouldBeTrue();`
`323`	`324`	`}`
`324`	`325`	`}`
`325`	`326`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,11 @@ public int BehindBy`
`111`	`111`	`/// Gets a value indicating whether this instance is current branch (HEAD) in the repository.`
`112`	`112`	`/// </summary>`
`113`	`113`	`/// <value>`
`114`		`- /// <c>true</c> if this instance is current branch; otherwise, <c>false</c>.`
	`114`	`+ /// <c>true</c> if this instance is the current branch; otherwise, <c>false</c>.`
`115`	`115`	`/// </value>`
`116`		`- public virtual bool IsCurrentRepositoryHead`
	`116`	`+ public bool IsCurrentRepositoryHead`
`117`	`117`	`{`
`118`		`- get { return repo.Refs[CanonicalName].ResolveToDirectReference() == repo.Refs["HEAD"].ResolveToDirectReference(); }`
	`118`	`+ get { return repo.Head == this; }`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/// <summary>`