Fix Commit() so that it always updates the HEAD

mumitroller · nulltoken · commit d8ac9e42e45f · 2014-04-26T18:34:41.000+02:00
Fix libgit2#692
diff --git a/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs b/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Linq;
 using System.Text;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
@@ -174,5 +175,31 @@ public void CanProvideDifferentConfigurationFilesToARepository()
 
             AssertValueInConfigFile(systemLocation, "xpaulbettsx");
         }
+
+        [Fact]
+        public void CanCommitOnBareRepository()
+        {
+            string repoPath = InitNewRepository(true);
+            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
+            string workPath = Path.Combine(scd.RootedDirectoryPath, "work");
+            Directory.CreateDirectory(workPath);
+
+            var repositoryOptions = new RepositoryOptions
+            {
+                WorkingDirectoryPath = workPath,
+                IndexPath = Path.Combine(scd.RootedDirectoryPath, "index")
+            };
+
+            using (var repo = new Repository(repoPath, repositoryOptions))
+            {
+                const string relativeFilepath = "test.txt";
+                Touch(repo.Info.WorkingDirectory, relativeFilepath, "test\n");
+                repo.Index.Stage(relativeFilepath);
+
+                Assert.NotNull(repo.Commit("Initial commit", Constants.Signature, Constants.Signature));
+                Assert.Equal(1, repo.Head.Commits.Count());
+                Assert.Equal(1, repo.Commits.Count());
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -894,14 +894,8 @@ public Commit Commit(string message, Signature author, Signature committer, Comm
 
             Proxy.git_repository_state_cleanup(handle);
 
-            var logAllRefUpdates = Config.GetValueOrDefault<bool>("core.logAllRefUpdates", false);
-            if (!logAllRefUpdates)
-            {
-                return result;
-            }
-
             var logMessage = BuildCommitLogMessage(result, options.AmendPreviousCommit, isHeadOrphaned, parents.Count > 1);
-            LogCommit(result, logMessage);
+            UpdateHeadAndTerminalReference(result, logMessage);
 
             return result;
         }
@@ -925,7 +919,7 @@ private static string BuildCommitLogMessage(Commit commit, bool amendPreviousCom
             return string.Format(CultureInfo.InvariantCulture, "commit{0}: {1}", kind, commit.MessageShort);
         }
 
-        private void LogCommit(Commit commit, string reflogMessage)
+        private void UpdateHeadAndTerminalReference(Commit commit, string reflogMessage)
         {
             Reference reference = Refs.Head;
 

Original file line number	Diff line number	Diff line change
`@@ -894,14 +894,8 @@ public Commit Commit(string message, Signature author, Signature committer, Comm`
`894`	`894`
`895`	`895`	`Proxy.git_repository_state_cleanup(handle);`
`896`	`896`
`897`		`- var logAllRefUpdates = Config.GetValueOrDefault<bool>("core.logAllRefUpdates", false);`
`898`		`- if (!logAllRefUpdates)`
`899`		`- {`
`900`		`- return result;`
`901`		`- }`
`902`		`-`
`903`	`897`	`var logMessage = BuildCommitLogMessage(result, options.AmendPreviousCommit, isHeadOrphaned, parents.Count > 1);`
`904`		`- LogCommit(result, logMessage);`
	`898`	`+ UpdateHeadAndTerminalReference(result, logMessage);`
`905`	`899`
`906`	`900`	`return result;`
`907`	`901`	`}`
`@@ -925,7 +919,7 @@ private static string BuildCommitLogMessage(Commit commit, bool amendPreviousCom`
`925`	`919`	`return string.Format(CultureInfo.InvariantCulture, "commit{0}: {1}", kind, commit.MessageShort);`
`926`	`920`	`}`
`927`	`921`
`928`		`- private void LogCommit(Commit commit, string reflogMessage)`
	`922`	`+ private void UpdateHeadAndTerminalReference(Commit commit, string reflogMessage)`
`929`	`923`	`{`
`930`	`924`	`Reference reference = Refs.Head;`
`931`	`925`