From f9bcbb72893ebcaaccd81f1347dd3ea5ac009619 Mon Sep 17 00:00:00 2001 From: Jo De Boeck Date: Mon, 25 Dec 2017 14:27:28 +0200 Subject: [PATCH] Small modes to release script (#1147) Signed-off-by: Jo De Boeck --- scripts/versions/makerelease | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/versions/makerelease b/scripts/versions/makerelease index 26221de12..ebf00f678 100755 --- a/scripts/versions/makerelease +++ b/scripts/versions/makerelease @@ -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})