diff --git a/hack/release.py b/hack/release.py index a42dacfab..50e8116cb 100755 --- a/hack/release.py +++ b/hack/release.py @@ -130,8 +130,9 @@ def release_apimachinery(self): print(repo) print('----------------------------------------------------------------------------------------') call('git clean -xfd', cwd=repo) + call('git reset --hard HEAD', cwd=repo) git_checkout('master', cwd=repo) - call('git pull --rebase origin master', cwd=repo) + call('git reset --hard origin/master', cwd=repo) call('glide slow', cwd=repo) if git_requires_commit(tag, cwd=repo): call('./hack/make.py', cwd=repo) @@ -154,8 +155,9 @@ def release_db(self, repo_name): print(repo) print('----------------------------------------------------------------------------------------') call('git clean -xfd', cwd=repo) + call('git reset --hard HEAD', cwd=repo) git_checkout('master', cwd=repo) - call('git pull --rebase origin master', cwd=repo) + call('git reset --hard origin/master', cwd=repo) with open(repo + '/glide.yaml', 'r+') as glide_file: glide_config = yaml.load(glide_file) glide_mod(glide_config, self.rel_deps) @@ -189,8 +191,9 @@ def release_server_binary(self, repo_name): print(repo) print('----------------------------------------------------------------------------------------') call('git clean -xfd', cwd=repo) + call('git reset --hard HEAD', cwd=repo) git_checkout('master', cwd=repo) - call('git pull --rebase origin master', cwd=repo) + call('git reset --hard origin/master', cwd=repo) with open(repo + '/glide.yaml', 'r+') as glide_file: glide_config = yaml.load(glide_file) glide_mod(glide_config, self.rel_deps)