logburn/git-utilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

10-remotes: check for remote branch

Browse Source
This commit is contained in:
rkiel
2017-10-07 10:20:33 -04:00
parent 941aed3389
commit 877f06944d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/shared/runnable.rb
View File

@@ -56,9 +56,15 @@ module Shared
run_cmd "git merge origin/#{branch}" run_cmd "git merge origin/#{branch}"
end end
def is_remote_branch (branch)
`git branch -r|grep origin|grep -v 'HEAD'|grep #{branch}`.strip != ""
end
def git_fetch_and_merge (branch) def git_fetch_and_merge (branch)
git_fetch git_fetch
git_remote_merge branch if is_remote_branch(branch)
git_remote_merge branch
end
end end
def git_remote_branch_delete ( branch ) def git_remote_branch_delete ( branch )