Only use the -n flag when a tag message is not defined #20

jakobehn · Jul 30, 2015 · 87d3dde · 87d3dde
1 parent 6838a02
commit 87d3dde
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/GitFlow.VS.Tests/GitFlowWrapperTests.cs b/GitFlow.VS.Tests/GitFlowWrapperTests.cs
@@ -288,6 +288,19 @@ public void FinishHotfix()
             }
         }
 
+        [TestMethod]
+        public void FinishHotfixWithTagShouldTagRepo()
+        {
+            var gf = new GitFlowWrapper(sampleRepoPath);
+            gf.Init(new GitFlowRepoSettings());
+            gf.StartHotfix("hf1");
+            gf.FinishHotfix("hf1", "1.2.3", false);
+            using (var repo = new Repository(sampleRepoPath))
+            {
+                Assert.AreEqual(1, repo.Tags.Count());
+            }
+        }
+
         [TestMethod]
         public void GitFlowInitWithInvalidMasterBranchShouldFail()
         {

diff --git a/GitFlow.VS/GitFlowWrapper.cs b/GitFlow.VS/GitFlowWrapper.cs
@@ -309,11 +309,15 @@ public GitFlowCommandResult StartRelease(string releaseName)
 
         public GitFlowCommandResult FinishRelease(string releaseName, string tagMessage = null, bool deleteBranch = true, bool forceDeletion=false, bool pushChanges = false)
         {
-            string gitArguments = "release finish -n \"" + TrimBranchName(releaseName) + "\"";
+            string gitArguments = "release finish \"" + TrimBranchName(releaseName) + "\"";
             if (!String.IsNullOrEmpty(tagMessage))
             {
                 gitArguments += " -m  + \"" + tagMessage + "\"";
             }
+            else
+            {
+                gitArguments += " -n";
+            }
             if (!deleteBranch)
             {
                 gitArguments += " -k";
@@ -338,11 +342,15 @@ public GitFlowCommandResult StartHotfix(string hotfixName)
 
         public GitFlowCommandResult FinishHotfix(string hotifxName, string tagMessage = null, bool deleteBranch = true, bool forceDeletion = false, bool pushChanges = false)
         {
-            string gitArguments = "hotfix finish -n \"" + TrimBranchName(hotifxName) + "\"";
+            string gitArguments = "hotfix finish \"" + TrimBranchName(hotifxName) + "\"";
             if (!String.IsNullOrEmpty(tagMessage))
             {
                 gitArguments += " -m  + \"" + tagMessage + "\"";
             }
+            else
+            {
+                gitArguments += " -n";
+            }
             if (!deleteBranch)
             {
                 gitArguments += " -k";