tree 652af9deb3d71ea46aa8752dda2984345da7cc29
parent 74a6b0951679e53f9bd43170bbddb3455a068792
author George Burgess IV <gbiv@google.com> 1593040206 -0700
committer George Burgess <gbiv@chromium.org> 1593040846 +0000

android_merge_from_upstream: fix up naming

This replaces `master` with `main` where possible, per the linked bug.

It also switches to a more concise way of making sure we're never on the
local branch.

BUG=chromium:1099035
TEST=Ran the script in android-llvm

Change-Id: I0e656057acec857a2c91480cbd822a5bc6778563
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2265045
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>