From fad06b020be27542749752c539f84dba525a428b Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 19 May 2017 15:25:39 -0700 Subject: [PATCH] Make sure to pull the latest master. --- zcutil/make-release.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zcutil/make-release.py b/zcutil/make-release.py index 14c9b959e..449d4d557 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -94,6 +94,9 @@ def verify_git_clean_master(): ), ) + out = sh_out('git', 'pull', '--ff-only') + logging.debug('+ git pull --ff-only\n%s', out) + # Helper code: def chdir_to_repo(repo):