Prevent feature branch push & track when merge strategy is rebase

Author: jondkinney

lib/zenflow/helpers/branch_commands/start.rb

@@ -22,8 +22,10 @@ def create_new_branch(offline=false)
               if !offline
                 Zenflow::Branch.update(branch(:source))
                 Zenflow::Branch.create("#{flow}/#{branch_name}", branch(:source))
-                Zenflow::Branch.push("#{flow}/#{branch_name}")
-                Zenflow::Branch.track("#{flow}/#{branch_name}")
+                unless Zenflow::Config[:merge_strategy] == 'rebase'
+                  Zenflow::Branch.push("#{flow}/#{branch_name}")
+                  Zenflow::Branch.track("#{flow}/#{branch_name}")
+                end
               else
                 Zenflow::Branch.checkout(branch(:source))
                 Zenflow::Branch.create("#{flow}/#{branch_name}", branch(:source))

spec/zenflow/helpers/branch_command_spec.rb

@@ -25,14 +25,28 @@ class TestCommand < Zenflow::BranchCommand
 
     describe "#start" do
       context "when online" do
-        before do
-          Zenflow.should_receive(:Ask).and_return("new-test-branch")
-          Zenflow::Branch.should_receive(:update).with("master")
-          Zenflow::Branch.should_receive(:create).with("test/new-test-branch", "master")
-          Zenflow::Branch.should_receive(:push).with("test/new-test-branch")
-          Zenflow::Branch.should_receive(:track).with("test/new-test-branch")
+        context 'merge_strategy: merge' do
+          before do
+            Zenflow.should_receive(:Ask).and_return("new-test-branch")
+            Zenflow::Branch.should_receive(:update).with("master")
+            Zenflow::Branch.should_receive(:create).with("test/new-test-branch", "master")
+            Zenflow::Branch.should_receive(:push).with("test/new-test-branch")
+            Zenflow::Branch.should_receive(:track).with("test/new-test-branch")
+          end
+          it { TestCommand.new.invoke(:start) }
+        end
+
+        context 'merge_strategy: rebase' do
+          before do
+            Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('rebase')
+            Zenflow.should_receive(:Ask).and_return("new-test-branch")
+            Zenflow::Branch.should_receive(:update).with("master")
+            Zenflow::Branch.should_receive(:create).with("test/new-test-branch", "master")
+            Zenflow::Branch.should_not_receive(:push).with("test/new-test-branch")
+            Zenflow::Branch.should_not_receive(:track).with("test/new-test-branch")
+          end
+          it { TestCommand.new.invoke(:start) }
         end
-        it { TestCommand.new.invoke(:start) }
       end
 
       context "when offline" do