Insert new reflog entry on merge commit

Saaman · nulltoken · commit 1e2bdea40046 · 2013-04-24T19:39:39.000+02:00
diff --git a/LibGit2Sharp.Tests/CommitFixture.cs b/LibGit2Sharp.Tests/CommitFixture.cs
@@ -542,11 +542,22 @@ public void CommitParentsAreMergeHeads()
                 string mergeHeadPath = Path.Combine(repo.Info.Path, "MERGE_HEAD");
                 File.WriteAllText(mergeHeadPath, "9fd738e8f7967c078dceed8190330fc8648ee56a\n");
 
-                Commit newMergedCommit = repo.Commit("Merge commit", DummySignature, DummySignature, false);
+                Assert.Equal(CurrentOperation.Merge, repo.Info.CurrentOperation);
+
+                Commit newMergedCommit = repo.Commit("Merge commit", DummySignature, DummySignature);
+
+                Assert.Equal(CurrentOperation.None, repo.Info.CurrentOperation);
 
                 Assert.Equal(2, newMergedCommit.Parents.Count());
                 Assert.Equal(newMergedCommit.Parents.First().Sha, "c47800c7266a2be04c571c04d5a6614691ea99bd");
                 Assert.Equal(newMergedCommit.Parents.Skip(1).First().Sha, "9fd738e8f7967c078dceed8190330fc8648ee56a");
+
+                // Assert reflog entry is created
+                var reflogEntry = repo.Refs.Log(repo.Refs.Head).First();
+                Assert.Equal(repo.Head.Tip.Id, reflogEntry.To);
+                Assert.NotNull(reflogEntry.Commiter.Email);
+                Assert.NotNull(reflogEntry.Commiter.Name);
+                Assert.Equal(string.Format("commit (merge): {0}", newMergedCommit.MessageShort), reflogEntry.Message);
             }
         }
 
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -721,12 +721,12 @@ public Commit Commit(string message, Signature author, Signature committer, bool
             Proxy.git_repository_merge_cleanup(handle);
 
             // Insert reflog entry
-            LogCommit(result, amendPreviousCommit, isHeadOrphaned);
+            LogCommit(result, amendPreviousCommit, isHeadOrphaned, parents.Count() > 1);
 
             return result;
         }
 
-        private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrphaned)
+        private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrphaned, bool isMergeCommit)
         {
             // Compute reflog message
             string reflogMessage = "commit";
@@ -738,6 +738,10 @@ private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrpha
             {
                 reflogMessage += " (amend)";
             }
+            else if(isMergeCommit)
+            {
+                reflogMessage += " (merge)";
+            }
 
             reflogMessage = string.Format("{0}: {1}", reflogMessage, commit.MessageShort);
 

Original file line number	Diff line number	Diff line change
`@@ -721,12 +721,12 @@ public Commit Commit(string message, Signature author, Signature committer, bool`
`721`	`721`	`Proxy.git_repository_merge_cleanup(handle);`
`722`	`722`
`723`	`723`	`// Insert reflog entry`
`724`		`- LogCommit(result, amendPreviousCommit, isHeadOrphaned);`
	`724`	`+ LogCommit(result, amendPreviousCommit, isHeadOrphaned, parents.Count() > 1);`
`725`	`725`
`726`	`726`	`return result;`
`727`	`727`	`}`
`728`	`728`
`729`		`- private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrphaned)`
	`729`	`+ private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrphaned, bool isMergeCommit)`
`730`	`730`	`{`
`731`	`731`	`// Compute reflog message`
`732`	`732`	`string reflogMessage = "commit";`
`@@ -738,6 +738,10 @@ private void LogCommit(Commit commit, bool amendPreviousCommit, bool isHeadOrpha`
`738`	`738`	`{`
`739`	`739`	`reflogMessage += " (amend)";`
`740`	`740`	`}`
	`741`	`+ else if(isMergeCommit)`
	`742`	`+ {`
	`743`	`+ reflogMessage += " (merge)";`
	`744`	`+ }`
`741`	`745`
`742`	`746`	`reflogMessage = string.Format("{0}: {1}", reflogMessage, commit.MessageShort);`
`743`	`747`