Skip to content

Commit

Permalink
Small modes to release script (#1147)
Browse files Browse the repository at this point in the history
Signed-off-by: Jo De Boeck <[email protected]>
  • Loading branch information
grimpy authored Dec 25, 2017
1 parent c432ffd commit f9bcbb7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/versions/makerelease
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ def main(manifest, force, dry):
repo['info'] = get_repo_info(repo['url'])
if j.system.fs.exists(repo['info'].path):
repo['client'] = j.clients.git.get(repo['info'].path)
repo['client'].repo.git.fetch('origin', '{0}:remotes/origin/{0}'.format(source.name))
repo['client'].repo.git.reset('--hard', 'remotes/origin/{0}'.format(source.name))
repo['client'].repo.git.fetch('origin', '{0}'.format(source.name))
repo['client'].repo.git.checkout('-B', source.name, 'remotes/origin/{0}'.format(source.name))
else:
j.console.info('Cloning {}/{}'.format(repo['info'].account, repo['info'].reponame))
j.do.pullGitRepo(repo['url'], **{target.type: target.name})
Expand Down

0 comments on commit f9bcbb7

Please sign in to comment.