Teach Repository.Reset to append to the Reflog

Saaman · Saaman · commit e210b9bd017a · 2013-05-23T12:09:26.000-03:00
diff --git a/LibGit2Sharp.Tests/ResetHeadFixture.cs b/LibGit2Sharp.Tests/ResetHeadFixture.cs
@@ -102,6 +102,7 @@ private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, boo
 
                 string branchIdentifier = branchIdentifierRetriever(branch);
                 repo.Checkout(branchIdentifier);
+                var oldHeadSha = repo.Head.Tip.Sha;
                 Assert.Equal(shouldHeadBeDetached, repo.Info.IsHeadDetached);
 
                 string expectedHeadName = expectedHeadNameRetriever(branch);
@@ -115,12 +116,16 @@ private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, boo
 
                 Assert.Equal(FileStatus.Staged, repo.Index.RetrieveStatus("a.txt"));
 
+                AssertReflogEntryIsCreated(repo.Refs.Log(repo.Refs.Head), tag.Target.Sha, string.Format("reset: moving to {0}", tag.Target.Sha), oldHeadSha);
+
                 /* Reset --soft the Head to a commit through its sha */
                 repo.Reset(ResetOptions.Soft, branch.Tip.Sha);
                 Assert.Equal(expectedHeadName, repo.Head.Name);
                 Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
 
                 Assert.Equal(FileStatus.Unaltered, repo.Index.RetrieveStatus("a.txt"));
+
+                AssertReflogEntryIsCreated(repo.Refs.Log(repo.Refs.Head), branch.Tip.Sha, string.Format("reset: moving to {0}", branch.Tip.Sha), tag.Target.Sha);
             }
         }
 
@@ -158,6 +163,9 @@ public void MixedResetRefreshesTheIndex()
                 repo.Reset(ResetOptions.Mixed, tag.CanonicalName);
 
                 Assert.Equal(FileStatus.Modified, repo.Index.RetrieveStatus("a.txt"));
+
+                AssertReflogEntryIsCreated(repo.Refs.Log(repo.Refs.Head), tag.Target.Sha, string.Format("reset: moving to {0}", tag.Target.Sha));
+
             }
         }
 
diff --git a/LibGit2Sharp.Tests/ResetIndexFixture.cs b/LibGit2Sharp.Tests/ResetIndexFixture.cs
@@ -67,10 +67,15 @@ public void ResetTheIndexWithTheHeadUnstagesEverything()
                 RepositoryStatus oldStatus = repo.Index.RetrieveStatus();
                 Assert.Equal(3, oldStatus.Where(IsStaged).Count());
 
+                var reflogEntriesCount = repo.Refs.Log(repo.Refs.Head).Count();
+
                 repo.Reset();
 
                 RepositoryStatus newStatus = repo.Index.RetrieveStatus();
                 Assert.Equal(0, newStatus.Where(IsStaged).Count());
+
+                // Assert that no reflog entry is created
+                Assert.Equal(reflogEntriesCount, repo.Refs.Log(repo.Refs.Head).Count());
             }
         }
 
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -727,6 +727,8 @@ public void Reset(ResetOptions resetOptions, Commit commit)
             Ensure.ArgumentNotNull(commit, "commit");
 
             Proxy.git_reset(handle, commit.Id, resetOptions);
+
+            Refs.Log(Refs.Head).Append(commit.Id, string.Format("reset: moving to {0}", commit.Sha));
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,15 @@ public void ResetTheIndexWithTheHeadUnstagesEverything()`
`67`	`67`	`RepositoryStatus oldStatus = repo.Index.RetrieveStatus();`
`68`	`68`	`Assert.Equal(3, oldStatus.Where(IsStaged).Count());`
`69`	`69`
	`70`	`+ var reflogEntriesCount = repo.Refs.Log(repo.Refs.Head).Count();`
	`71`	`+`
`70`	`72`	`repo.Reset();`
`71`	`73`
`72`	`74`	`RepositoryStatus newStatus = repo.Index.RetrieveStatus();`
`73`	`75`	`Assert.Equal(0, newStatus.Where(IsStaged).Count());`
	`76`	`+`
	`77`	`+ // Assert that no reflog entry is created`
	`78`	`+ Assert.Equal(reflogEntriesCount, repo.Refs.Log(repo.Refs.Head).Count());`
`74`	`79`	`}`
`75`	`80`	`}`
`76`	`81`
Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,8 @@ public void Reset(ResetOptions resetOptions, Commit commit)`
`727`	`727`	`Ensure.ArgumentNotNull(commit, "commit");`
`728`	`728`
`729`	`729`	`Proxy.git_reset(handle, commit.Id, resetOptions);`
	`730`	`+`
	`731`	`+ Refs.Log(Refs.Head).Append(commit.Id, string.Format("reset: moving to {0}", commit.Sha));`
`730`	`732`	`}`
`731`	`733`
`732`	`734`	`/// <summary>`