Commit 53bec30d authored by Stan Hu's avatar Stan Hu

Add preface to command-line and fix check of ci_sha

parent be1ca115
#!/usr/bin/env ruby
def run(cmd)
puts cmd.join(' ')
puts "(support/self-update-git-worktree) > #{cmd.join(' ')}"
system(*cmd)
end
......@@ -15,7 +15,7 @@ if ci_project_dir && ci_sha
end
if ci_sha
run(%w[git merge --ff-only origin/master])
else
run(%W[git checkout #{ci_sha}])
else
run(%w[git merge --ff-only origin/master])
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment