Fix gitextensions#3501 (gitextensions#4402)

* Fix gitextensions#3501 * Add unit tests for fix gitextensions#3501
gerhardol · Jan 31, 2018 · e6cf41f · e6cf41f
1 parent ec750e0
commit e6cf41f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -2098,7 +2098,10 @@ public string CommitCmd(bool amend, bool signOff = false, string author = "", bo
                 command += " --signoff";
 
             if (!string.IsNullOrEmpty(author))
+            {
+                author = author.Trim().Trim('"');
                 command += " --author=\"" + author + "\"";
+            }                
 
             if (useExplicitCommitMessage)
             {

diff --git a/UnitTests/GitCommandsTests/GitCommandsTests.csproj b/UnitTests/GitCommandsTests/GitCommandsTests.csproj
@@ -75,6 +75,7 @@
     <Compile Include="FileAssociatedIconProviderTests.cs" />
     <Compile Include="FullPathResolverTests.cs" />
     <Compile Include="GitExtLinks\GitExtLinksTests.cs" />
+    <Compile Include="GitModuleTest.cs" />
     <Compile Include="GitRevisionInfoProviderTests.cs" />
     <Compile Include="Git\EncodingHelperTest.cs" />
     <Compile Include="Git\GitBlameHeaderTest.cs" />

diff --git a/UnitTests/GitCommandsTests/GitModuleTest.cs b/UnitTests/GitCommandsTests/GitModuleTest.cs
@@ -0,0 +1,25 @@
+using GitCommands;
+using NUnit.Framework;
+
+namespace GitCommandsTests
+{
+    [TestFixture]
+    public class GitModuleTest
+    {
+        GitModule _gitModule;
+        [SetUp]
+        public void SetUp()
+        {
+            _gitModule = new GitModule(null);
+        }
+
+        [TestCase(@"  ""author <author@mail.com>""  ", @"commit --author=""author <author@mail.com>"" -F ""COMMITMESSAGE""")]
+        [TestCase(@"""author <author@mail.com>""", @"commit --author=""author <author@mail.com>"" -F ""COMMITMESSAGE""")]
+        [TestCase(@"author <author@mail.com>", @"commit --author=""author <author@mail.com>"" -F ""COMMITMESSAGE""")]
+        public void CommitCmdShouldTrimAuthor(string input, string expected)
+        {
+            var actual = _gitModule.CommitCmd(false, author: input);
+            StringAssert.AreEqualIgnoringCase(expected, actual);
+        }
+    }
+}