lib/pivotal-integration/command/finish.rb in pivotal-integration-1.6.0.2 vs lib/pivotal-integration/command/finish.rb in pivotal-integration-1.6.0.3

- old
+ new

@@ -31,11 +31,14 @@ no_delete = @options.fetch(:no_delete, false) no_merge = @options.fetch(:no_merge, false) pull_request = @options.fetch(:pull_request, false) || PivotalIntegration::Util::Git.finish_mode == :pull_request if pull_request + root_branch = PivotalIntegration::Util::Git.get_config('root-branch', :branch) + root_branch = nil if root_branch == 'master' + PivotalIntegration::Util::Git.push PivotalIntegration::Util::Git.branch_name - PivotalIntegration::Util::Git.create_pull_request(@configuration.story) + PivotalIntegration::Util::Git.create_pull_request(@configuration.story, root_branch) PivotalIntegration::Util::Story.mark(@configuration.story, :finished) return end unless no_merge