tools/cl: add 'fetch origin' before 'checkout -B'

'checkout -B' would fail if 'origin' isn't fetched or is too outdated.

BUG=None
TEST=tools/cl # on a repo where 'origin' isn't fetched

Change-Id: I13a5d8a3796c4c9002243902a5f8d145dc9393ef
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3844820
Tested-by: Victor Ding <victording@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Victor Ding <victording@chromium.org>
Auto-Submit: Victor Ding <victording@chromium.org>
This commit is contained in:
Victor Ding 2022-08-22 07:48:16 +00:00 committed by crosvm LUCI
parent 48fbede24a
commit cb243d3ef0

View file

@ -188,6 +188,7 @@ def rebase():
rev = git("rev-parse", upstream_branch_name).stdout(check=False)
if rev:
print(f"Leaving behind previous revision of {upstream_branch_name}: {rev}")
git("fetch origin").fg()
git("checkout -B", upstream_branch_name, "origin/main").fg(quiet=True)
print(f"Cherry-picking changes from {branch_name}")