Sha256: 9c53c57bd823aced5ff966e671a85617377f7cf3959cc25ac27b06f3d57a240f
Contents?: true
Size: 1.07 KB
Versions: 16
Compression:
Stored size: 1.07 KB
Contents
require 'thor'
require 'thegarage/gitx'
require 'thegarage/gitx/cli/base_command'
module Thegarage
module Gitx
module Cli
class UpdateCommand < BaseCommand
desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
def update
say "Updating "
say "#{current_branch.name} ", :green
say "with latest changes from "
say Thegarage::Gitx::BASE_BRANCH, :green
update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
update_branch(Thegarage::Gitx::BASE_BRANCH)
run_cmd 'git push origin HEAD'
end
private
def update_branch(branch)
begin
run_cmd "git pull origin #{branch}"
rescue
fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun the update command"
end
end
def remote_branch_exists?(branch)
repo.branches.each_name(:remote).include?("origin/#{branch}")
end
end
end
end
end
Version data entries
16 entries across 16 versions & 1 rubygems