Skip to content

Commit

Permalink
Set branch tracking to master
Browse files Browse the repository at this point in the history
  • Loading branch information
perdy committed Oct 16, 2017
1 parent 29e8876 commit 6febef3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion make
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ def install_service(service, *args, **kwargs):
# Clone or update
if not os.path.exists(service_path):
logger.info('Downloading Barrenero %s', service)
Repo.clone_from(SERVICES[service]['url'], service_path)
service_repo = Repo.clone_from(SERVICES[service]['url'], service_path)
service_repo.heads.master.set_tracking_branch(service_repo.remotes.origin.refs.master)
else:
logger.info('Updating Barrenero %s', service)
service_repo = Repo(service_path)
service_repo.remotes.origin.fetch()
service_repo.heads.master.set_tracking_branch(service_repo.remotes.origin.refs.master)
service_repo.remotes.origin.pull()

# Run installation
Expand All @@ -134,6 +136,7 @@ def update_service(service, path):
logger.info('Updating Barrenero %s', service)
service_repo = Repo(service_path)
service_repo.remotes.origin.fetch()
service_repo.heads.master.set_tracking_branch(service_repo.remotes.origin.refs.master)
service_repo.remotes.origin.pull()


Expand Down

0 comments on commit 6febef3

Please sign in to comment.