ravindp
diff --git a/‎LibGit2Sharp.Tests/CommitFixture.cs
Lines changed: 22 additions & 0 deletions b/‎LibGit2Sharp.Tests/CommitFixture.cs
Lines changed: 22 additions & 0 deletions
diff --git a/‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
Lines changed: 14 additions & 2 deletions b/‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
Lines changed: 14 additions & 2 deletions
@@ -5,6 +5,7 @@
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
+using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -519,6 +520,27 @@ public void DirectlyAccessingAnUnknownTreeEntryOfTheCommitReturnsNull()
             }
         }
 
+        [Theory]
+        [InlineData(null, "x@example.com")]
+        [InlineData("", "x@example.com")]
+        [InlineData("X", null)]
+        [InlineData("X", "")]
+        public void CommitWithInvalidSignatureConfigThrows(string name, string email)
+        {
+            string repoPath = InitNewRepository();
+            string configPath = CreateConfigurationWithDummyUser(name, email);
+            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
+
+            using (var repo = new Repository(repoPath, options))
+            {
+                Assert.Equal(name, repo.Config.GetValueOrDefault<string>("user.name"));
+                Assert.Equal(email, repo.Config.GetValueOrDefault<string>("user.email"));
+
+                Assert.Throws<LibGit2SharpException>(
+                    () => repo.Commit("Initial egotistic commit", new CommitOptions { AllowEmptyCommit = true }));
+            }
+        }
+
         [Fact]
         public void CanCommitWithSignatureFromConfig()
         {
 
@@ -298,15 +298,27 @@ private static RepositoryOptions BuildFakeRepositoryOptions(SelfCleaningDirector
         /// <param name="signature">The signature to use for user.name and user.email</param>
         /// <returns>The path to the configuration file</returns>
         protected string CreateConfigurationWithDummyUser(Signature signature)
+        {
+            return CreateConfigurationWithDummyUser(signature.Name, signature.Email);
+        }
+
+        protected string CreateConfigurationWithDummyUser(string name, string email)
         {
             SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
             Directory.CreateDirectory(scd.DirectoryPath);
             string configFilePath = Path.Combine(scd.DirectoryPath, "global-config");
 
             using (Configuration config = new Configuration(configFilePath))
             {
-                config.Set("user.name", signature.Name, ConfigurationLevel.Global);
-                config.Set("user.email", signature.Email, ConfigurationLevel.Global);
+                if (name != null)
+                {
+                    config.Set("user.name", name, ConfigurationLevel.Global);
+                }
+
+                if (email != null)
+                {
+                    config.Set("user.email", email, ConfigurationLevel.Global);
+                }
             }
 
             return configFilePath;