Checkout is not allowed in a bare repository

Author: jamill

LibGit2Sharp.Tests/BranchFixture.cs

@@ -421,17 +421,17 @@ public void CanWalkCommitsFromBranch()
         }
 
         [Theory]
-        [InlineData("test")]
-        [InlineData("refs/heads/test")]
-        public void CanCheckoutAnExistingBranch(string name)
+        [InlineData("i-do-numbers")]
+        [InlineData("diff-test-cases")]
+        public void CanCheckoutAnExistingBranch(string branchName)
         {
-            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
             using (var repo = new Repository(path.RepositoryPath))
             {
                 Branch master = repo.Branches["master"];
                 Assert.True(master.IsCurrentRepositoryHead);
 
-                Branch branch = repo.Branches[name];
+                Branch branch = repo.Branches[branchName];
                 Assert.NotNull(branch);
 
                 Branch test = repo.Checkout(branch);
@@ -446,17 +446,17 @@ public void CanCheckoutAnExistingBranch(string name)
         }
 
         [Theory]
-        [InlineData("test")]
-        [InlineData("refs/heads/test")]
-        public void CanCheckoutAnExistingBranchByName(string name)
+        [InlineData("i-do-numbers")]
+        [InlineData("diff-test-cases")]
+        public void CanCheckoutAnExistingBranchByName(string branchName)
         {
-            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
             using (var repo = new Repository(path.RepositoryPath))
             {
                 Branch master = repo.Branches["master"];
                 Assert.True(master.IsCurrentRepositoryHead);
 
-                Branch test = repo.Checkout(name);
+                Branch test = repo.Checkout(branchName);
                 Assert.False(repo.Info.IsHeadDetached);
 
                 Assert.False(test.IsRemote);
@@ -472,33 +472,43 @@ public void CanCheckoutAnExistingBranchByName(string name)
         [InlineData("refs/tags/lw")]
         public void CanCheckoutAnArbitraryCommit(string commitPointer)
         {
-            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
             using (var repo = new Repository(path.RepositoryPath))
             {
                 Branch master = repo.Branches["master"];
                 Assert.True(master.IsCurrentRepositoryHead);
 
                 Branch detachedHead = repo.Checkout(commitPointer);
 
+                Assert.Equal(repo.Head, detachedHead);
+                Assert.Equal(repo.Lookup(commitPointer).Sha, detachedHead.Tip.Sha);
+                Assert.True(repo.Head.IsCurrentRepositoryHead);
                 Assert.True(repo.Info.IsHeadDetached);
 
+                Assert.True(detachedHead.IsCurrentRepositoryHead);
                 Assert.False(detachedHead.IsRemote);
                 Assert.Equal(detachedHead.Name, detachedHead.CanonicalName);
-                Assert.Equal("(no branch)", detachedHead.CanonicalName);
-                Assert.Equal(repo.Lookup(commitPointer).Sha, detachedHead.Tip.Sha);
 
-                Assert.Equal(repo.Head, detachedHead);
+                Assert.Equal("(no branch)", detachedHead.CanonicalName);
 
                 Assert.False(master.IsCurrentRepositoryHead);
-                Assert.True(detachedHead.IsCurrentRepositoryHead);
-                Assert.True(repo.Head.IsCurrentRepositoryHead);
             }
         }
 
         [Fact]
-        public void CheckingOutANonExistingBranchThrows()
+        public void CheckingOutInABareRepoThrows()
         {
             using (var repo = new Repository(BareTestRepoPath))
+            {
+                Assert.Throws<InvalidOperationException>(() => repo.Checkout(repo.Branches["refs/heads/test"]));
+                Assert.Throws<InvalidOperationException>(() => repo.Checkout("refs/heads/test"));
+            }
+        }
+
+        [Fact]
+        public void CheckingOutANonExistingBranchThrows()
+        {
+            using (var repo = new Repository(StandardTestRepoWorkingDirPath))
             {
                 Assert.Throws<LibGit2SharpException>(() => repo.Checkout("i-do-not-exist"));
             }
@@ -507,7 +517,7 @@ public void CheckingOutANonExistingBranchThrows()
         [Fact]
         public void CheckingOutABranchWithBadParamsThrows()
         {
-            using (var repo = new Repository(BareTestRepoPath))
+            using (var repo = new Repository(StandardTestRepoWorkingDirPath))
             {
                 Assert.Throws<ArgumentException>(() => repo.Checkout(string.Empty));
                 Assert.Throws<ArgumentNullException>(() => repo.Checkout(default(Branch)));

LibGit2Sharp.Tests/CommitFixture.cs

@@ -25,15 +25,16 @@ public void CanCountCommits()
         [Fact]
         public void CanCorrectlyCountCommitsWhenSwitchingToAnotherBranch()
         {
-            using (var repo = new Repository(BareTestRepoPath))
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
+            using (var repo = new Repository(path.RepositoryPath))
             {
                 repo.Checkout("test");
                 Assert.Equal(2, repo.Commits.Count());
                 Assert.Equal("e90810b8df3e80c413d903f631643c716887138d", repo.Commits.First().Id.Sha);
 
                 repo.Checkout("master");
-                Assert.Equal(7, repo.Commits.Count());
-                Assert.Equal("4c062a6361ae6959e06292c1fa5e2822d9c96345", repo.Commits.First().Id.Sha);
+                Assert.Equal(9, repo.Commits.Count());
+                Assert.Equal("32eab9cb1f450b5fe7ab663462b77d7f4b703344", repo.Commits.First().Id.Sha);
             }
         }
 
@@ -221,7 +222,7 @@ public void CanEnumerateFromHead()
         [Fact]
         public void CanEnumerateFromDetachedHead()
         {
-            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
             using (var repoClone = new Repository(path.RepositoryPath))
             {
                 string headSha = repoClone.Head.Tip.Sha;
@@ -231,7 +232,8 @@ public void CanEnumerateFromDetachedHead()
                     repo => new Filter { Since = repo.Head },
                     new[]
                         {
-                            "4c062a6", "be3563a", "c47800c", "9fd738e",
+                            "32eab9c", "592d3c8", "4c062a6",
+                            "be3563a", "c47800c", "9fd738e",
                             "4a202b3", "5b5b025", "8496071",
                         });
             }

LibGit2Sharp/Repository.cs

@@ -404,6 +404,11 @@ public static string Discover(string startingPath)
         /// <returns>The new HEAD.</returns>
         public Branch Checkout(string commitOrBranchSpec)
         {
+            if (Info.IsBare)
+            {
+                throw new InvalidOperationException("Checkout is not allowed in a bare repository.");
+            }
+
             // TODO: This does not yet checkout (write) the working directory
 
             var branch = Branches[commitOrBranchSpec];
@@ -427,6 +432,11 @@ public Branch Checkout(Branch branch)
         {
             Ensure.ArgumentNotNull(branch, "branch");
 
+            if (Info.IsBare)
+            {
+                throw new InvalidOperationException("Checkout is not allowed in a bare repository.");
+            }
+
             Refs.UpdateTarget("HEAD", branch.CanonicalName);
             return branch;
         }