GitFlow: Error during work with local branches only #53

Author: sboulema

TGit/Commands/GitFlowMenuCommands.cs

@@ -78,9 +78,9 @@ private void InitCommand(object sender, EventArgs e)
             var versionTag = string.IsNullOrEmpty(flowDialog.GitConfig.TagPrefix) ? "\"\"" : flowDialog.GitConfig.TagPrefix;
 
             /* 1. Add GitFlow config options
-                 * 2. Checkout develop branch (create if it doesn't exist, reset if it does)
-                 * 3. Push develop branch
-                 */
+             * 2. Checkout develop branch (create if it doesn't exist, reset if it does)
+             * 3. Push develop branch
+             */
             var process = ProcessHelper.StartProcessGui(_dte, _envHelper,
                 "cmd.exe",
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
@@ -118,7 +118,7 @@ private void StartFeatureCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {flowOptions.DevelopBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"checkout -b {flowOptions.FeaturePrefix}{featureName} {flowOptions.DevelopBranch}", false),
                 $"Starting feature {featureName}"
             );
@@ -139,7 +139,7 @@ private void StartFeatureGitHubCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand("checkout master") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"checkout -b {featureName} master", false),
                 $"Starting feature {featureName}"
             );
@@ -164,7 +164,7 @@ private void FinishFeatureCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {gitConfig.DevelopBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {featureBranch}", false),
                 $"Finishing feature {featureName}",
                 featureBranch, null, _options, FormatCliCommand($"push origin {gitConfig.DevelopBranch}")
@@ -195,7 +195,7 @@ private void FinishFeatureGitHubCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand("checkout master") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {featureBranch}", false),
                 $"Finishing feature {featureName}",
                 featureBranch, null, _options, FormatCliCommand("push origin master"));
@@ -218,7 +218,7 @@ private void StartReleaseCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {flowOptions.DevelopBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"checkout -b {flowOptions.ReleasePrefix}{releaseVersion} {flowOptions.DevelopBranch}", false),
                 $"Starting release {releaseVersion}"
             );
@@ -249,11 +249,11 @@ private void FinishReleaseCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {gitConfig.MasterBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {releaseBranch}") +
                     FormatCliCommand($"tag {gitConfig.TagPrefix}{releaseName}") +
                     FormatCliCommand($"checkout {gitConfig.DevelopBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {releaseBranch}", false),
                 $"Finishing release {releaseName}",
                 releaseBranch, null, _options,
@@ -280,7 +280,7 @@ private void StartHotfixCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {flowOptions.MasterBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"checkout -b {flowOptions.HotfixPrefix}{hotfixVersion} {flowOptions.MasterBranch}", false),
                 $"Starting hotfix {hotfixVersion}"
             );
@@ -311,11 +311,11 @@ private void FinishHotfixCommand(object sender, EventArgs e)
                 $"/c cd \"{_envHelper.GetSolutionDir()}\" && " +
                     GitHelper.GetSshSetup(_envHelper) +
                     FormatCliCommand($"checkout {gitConfig.MasterBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {hotfixBranch}") +
                     FormatCliCommand($"tag {gitConfig.TagPrefix}{hotfixName}") +
                     FormatCliCommand($"checkout {gitConfig.DevelopBranch}") +
-                    FormatCliCommand("pull") +
+                    (_options.PullChanges ? FormatCliCommand("pull") : string.Empty) +
                     FormatCliCommand($"merge --no-ff {hotfixBranch}", false),
                 $"Finishing hotfix {hotfixName}",
                 hotfixBranch, null, _options, 

TGit/OptionsGeneral.cs

@@ -34,6 +34,11 @@ public class OptionPageGrid : DialogPage
         [Description("When finishing a feature push the changes to the remote by default")]
         public bool PushChanges { get; set; }
 
+        [Category("TGit")]
+        [DisplayName(@"Pull changes")]
+        [Description("When starting/finishing a feature pull the changes from the remote by default")]
+        public bool PullChanges { get; set; } = true;
+
         [Category("TGit")]
         [DisplayName(@"Default bug id")]
         [Description("$(BranchName), $(FeatureName), https://msdn.microsoft.com/en-us/library/c02as0cs.aspx")]

azure-pipelines.yml

@@ -10,15 +10,15 @@ trigger:
   branches:
     include:
     - master
-# tags: none
+    - release/*
 
 variables:
   patch: $[counter('versioncounter', 41)]
   solution: '**/*.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
 
-name: 4.10.$(patch)
+name: 4.11.$(patch)
 
 steps:
 - task: NuGetToolInstaller@0