##// END OF EJS Templates
separate pull from commit in test_pr
MinRK -
Show More
@@ -83,7 +83,8 b' def get_branch(repo, branch, owner, mergeable):'
83 # Delete the branch first
83 # Delete the branch first
84 call(['git', 'branch', '-D', merged_branch])
84 call(['git', 'branch', '-D', merged_branch])
85 check_call(['git', 'checkout', '-b', merged_branch])
85 check_call(['git', 'checkout', '-b', merged_branch])
86 check_call(['git', 'pull', repo, branch])
86 check_call(['git', 'pull', '--no-commit', repo, branch])
87 check_call(['git', 'commit', '-m', "merge %s/%s" % (repo, branch)])
87 else:
88 else:
88 # Fetch the branch without merging it.
89 # Fetch the branch without merging it.
89 check_call(['git', 'fetch', repo, branch])
90 check_call(['git', 'fetch', repo, branch])
General Comments 0
You need to be logged in to leave comments. Login now