Ensure Tags can be created in detached Head state

nulltoken · nulltoken · commit 4252d5539b38 · 2014-08-27T19:38:47.000+02:00
Fix libgit2#791
diff --git a/LibGit2Sharp.Tests/ResetHeadFixture.cs b/LibGit2Sharp.Tests/ResetHeadFixture.cs
@@ -18,7 +18,7 @@ public void ResetANewlyInitializedRepositoryThrows(bool isBare)
 
             using (var repo = new Repository(repoPath))
             {
-                Assert.Throws<LibGit2SharpException>(() => repo.Reset(ResetMode.Soft));
+                Assert.Throws<UnbornBranchException>(() => repo.Reset(ResetMode.Soft));
             }
         }
 
diff --git a/LibGit2Sharp.Tests/ResetIndexFixture.cs b/LibGit2Sharp.Tests/ResetIndexFixture.cs
@@ -25,7 +25,7 @@ public void ResetANewlyInitializedNonBareRepositoryThrows()
 
             using (var repo = new Repository(repoPath))
             {
-                Assert.Throws<LibGit2SharpException>(() => repo.Reset());
+                Assert.Throws<UnbornBranchException>(() => repo.Reset());
             }
         }
 
diff --git a/LibGit2Sharp.Tests/TagFixture.cs b/LibGit2Sharp.Tests/TagFixture.cs
@@ -234,7 +234,7 @@ public void CreatingATagInAEmptyRepositoryThrows()
 
             using (var repo = new Repository(repoPath))
             {
-                Assert.Throws<LibGit2SharpException>(() => repo.ApplyTag("mynotag"));
+                Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mynotag"));
             }
         }
 
@@ -246,7 +246,8 @@ public void CreatingATagForHeadInAEmptyRepositoryThrows()
 
             using (var repo = new Repository(repoPath))
             {
-                Assert.Throws<LibGit2SharpException>(() => repo.ApplyTag("mytaghead", "HEAD"));
+                Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mytaghead", "HEAD"));
+                Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mytaghead"));
             }
         }
 
@@ -287,6 +288,26 @@ public void CanAddATagForImplicitHead()
             }
         }
 
+        [Fact]
+        public void CanAddATagForImplicitHeadInDetachedState()
+        {
+            string path = CloneStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                repo.Checkout(repo.Head.Tip);
+
+                Assert.True(repo.Info.IsHeadDetached);
+
+                Tag tag = repo.ApplyTag("mytag");
+                Assert.NotNull(tag);
+
+                Assert.Equal(repo.Head.Tip.Id, tag.Target.Id);
+
+                Tag retrievedTag = repo.Tags[tag.CanonicalName];
+                Assert.Equal(retrievedTag, tag);
+            }
+        }
+
         [Fact]
         // Ported from cgit (https://github.com/git/git/blob/1c08bf50cfcf924094eca56c2486a90e2bf1e6e2/t/t7004-tag.sh#L87)
         public void CreatingADuplicateTagThrows()
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs
@@ -209,13 +209,32 @@ public static void ArgumentConformsTo<T>(T argumentValue, Func<T, bool> checker,
         }
 
         public static void GitObjectIsNotNull(GitObject gitObject, string identifier)
+        {
+            Func<string, LibGit2SharpException> exceptionBuilder;
+
+            if (string.Equals("HEAD", identifier, StringComparison.Ordinal))
+            {
+                exceptionBuilder = m => new UnbornBranchException(m);
+            }
+            else
+            {
+                exceptionBuilder = m => new LibGit2SharpException(m);
+            }
+
+            GitObjectIsNotNull(gitObject, identifier, exceptionBuilder);
+        }
+
+        public static void GitObjectIsNotNull(
+            GitObject gitObject,
+            string identifier,
+            Func<string, LibGit2SharpException> exceptionBuilder)
         {
             if (gitObject != null)
             {
                 return;
             }
 
-            throw new LibGit2SharpException(string.Format(CultureInfo.InvariantCulture,
+            throw exceptionBuilder(string.Format(CultureInfo.InvariantCulture,
                                                      "No valid git object identified by '{0}' exists in the repository.",
                                                      identifier));
         }
diff --git a/LibGit2Sharp/RepositoryExtensions.cs b/LibGit2Sharp/RepositoryExtensions.cs
@@ -68,7 +68,7 @@ private static void EnsureNoGitLink<T>() where T : GitObject
         /// <param name="tagName">The name of the tag to create.</param>
         public static Tag ApplyTag(this IRepository repository, string tagName)
         {
-            return ApplyTag(repository, tagName, repository.Head.CanonicalName);
+            return repository.Tags.Add(tagName, RetrieveHeadCommit(repository));
         }
 
         /// <summary>
@@ -91,7 +91,16 @@ public static Tag ApplyTag(this IRepository repository, string tagName, string o
         /// <param name="message">The annotation message.</param>
         public static Tag ApplyTag(this IRepository repository, string tagName, Signature tagger, string message)
         {
-            return ApplyTag(repository, tagName, repository.Head.CanonicalName, tagger, message);
+            return repository.Tags.Add(tagName, RetrieveHeadCommit(repository), tagger, message);
+        }
+
+        private static Commit RetrieveHeadCommit(IRepository repository)
+        {
+            Commit commit = repository.Head.Tip;
+
+            Ensure.GitObjectIsNotNull(commit, "HEAD", m => new UnbornBranchException(m));
+
+            return commit;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public void ResetANewlyInitializedRepositoryThrows(bool isBare)`
`18`	`18`
`19`	`19`	`using (var repo = new Repository(repoPath))`
`20`	`20`	`{`
`21`		`- Assert.Throws<LibGit2SharpException>(() => repo.Reset(ResetMode.Soft));`
	`21`	`+ Assert.Throws<UnbornBranchException>(() => repo.Reset(ResetMode.Soft));`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void ResetANewlyInitializedNonBareRepositoryThrows()`
`25`	`25`
`26`	`26`	`using (var repo = new Repository(repoPath))`
`27`	`27`	`{`
`28`		`- Assert.Throws<LibGit2SharpException>(() => repo.Reset());`
	`28`	`+ Assert.Throws<UnbornBranchException>(() => repo.Reset());`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public void CreatingATagInAEmptyRepositoryThrows()`
`234`	`234`
`235`	`235`	`using (var repo = new Repository(repoPath))`
`236`	`236`	`{`
`237`		`- Assert.Throws<LibGit2SharpException>(() => repo.ApplyTag("mynotag"));`
	`237`	`+ Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mynotag"));`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`@@ -246,7 +246,8 @@ public void CreatingATagForHeadInAEmptyRepositoryThrows()`
`246`	`246`
`247`	`247`	`using (var repo = new Repository(repoPath))`
`248`	`248`	`{`
`249`		`- Assert.Throws<LibGit2SharpException>(() => repo.ApplyTag("mytaghead", "HEAD"));`
	`249`	`+ Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mytaghead", "HEAD"));`
	`250`	`+ Assert.Throws<UnbornBranchException>(() => repo.ApplyTag("mytaghead"));`
`250`	`251`	`}`
`251`	`252`	`}`
`252`	`253`
`@@ -287,6 +288,26 @@ public void CanAddATagForImplicitHead()`
`287`	`288`	`}`
`288`	`289`	`}`
`289`	`290`
	`291`	`+ [Fact]`
	`292`	`+ public void CanAddATagForImplicitHeadInDetachedState()`
	`293`	`+ {`
	`294`	`+ string path = CloneStandardTestRepo();`
	`295`	`+ using (var repo = new Repository(path))`
	`296`	`+ {`
	`297`	`+ repo.Checkout(repo.Head.Tip);`
	`298`	`+`
	`299`	`+ Assert.True(repo.Info.IsHeadDetached);`
	`300`	`+`
	`301`	`+ Tag tag = repo.ApplyTag("mytag");`
	`302`	`+ Assert.NotNull(tag);`
	`303`	`+`
	`304`	`+ Assert.Equal(repo.Head.Tip.Id, tag.Target.Id);`
	`305`	`+`
	`306`	`+ Tag retrievedTag = repo.Tags[tag.CanonicalName];`
	`307`	`+ Assert.Equal(retrievedTag, tag);`
	`308`	`+ }`
	`309`	`+ }`
	`310`	`+`
`290`	`311`	`[Fact]`
`291`	`312`	`// Ported from cgit (https://github.com/git/git/blob/1c08bf50cfcf924094eca56c2486a90e2bf1e6e2/t/t7004-tag.sh#L87)`
`292`	`313`	`public void CreatingADuplicateTagThrows()`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private static void EnsureNoGitLink<T>() where T : GitObject`
`68`	`68`	`/// <param name="tagName">The name of the tag to create.</param>`
`69`	`69`	`public static Tag ApplyTag(this IRepository repository, string tagName)`
`70`	`70`	`{`
`71`		`- return ApplyTag(repository, tagName, repository.Head.CanonicalName);`
	`71`	`+ return repository.Tags.Add(tagName, RetrieveHeadCommit(repository));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/// <summary>`
`@@ -91,7 +91,16 @@ public static Tag ApplyTag(this IRepository repository, string tagName, string o`
`91`	`91`	`/// <param name="message">The annotation message.</param>`
`92`	`92`	`public static Tag ApplyTag(this IRepository repository, string tagName, Signature tagger, string message)`
`93`	`93`	`{`
`94`		`- return ApplyTag(repository, tagName, repository.Head.CanonicalName, tagger, message);`
	`94`	`+ return repository.Tags.Add(tagName, RetrieveHeadCommit(repository), tagger, message);`
	`95`	`+ }`
	`96`	`+`
	`97`	`+ private static Commit RetrieveHeadCommit(IRepository repository)`
	`98`	`+ {`
	`99`	`+ Commit commit = repository.Head.Tip;`
	`100`	`+`
	`101`	`+ Ensure.GitObjectIsNotNull(commit, "HEAD", m => new UnbornBranchException(m));`
	`102`	`+`
	`103`	`+ return commit;`
`95`	`104`	`}`
`96`	`105`
`97`	`106`	`/// <summary>`