aboutsummaryrefslogtreecommitdiff
path: root/llvm_tools/nightly_revert_checker.py
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2021-03-09 14:55:48 -0800
committerGeorge Burgess <gbiv@chromium.org>2021-03-10 20:19:04 +0000
commit52a1c9d77fa049176c8d1bc63e2085a57f690ac6 (patch)
treefb9ec12d7f7e1ef21f2350689a901841db5434e3 /llvm_tools/nightly_revert_checker.py
parent0833f0c26c8c84e8dcfb1b6d47dd10c4189959cd (diff)
downloadtoolchain-utils-52a1c9d77fa049176c8d1bc63e2085a57f690ac6.tar.gz
nightly_revert_checker: update branch name
Android updated this branch name, so we have to reflect that here. BUG=b:182277561 TEST=None Change-Id: Ia709901bf8544eb751bc4c736f9e351640c52329 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2746504 Reviewed-by: Pirama Arumuga Nainar <pirama@google.com> Reviewed-by: George Burgess <gbiv@chromium.org> Tested-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'llvm_tools/nightly_revert_checker.py')
-rwxr-xr-xllvm_tools/nightly_revert_checker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm_tools/nightly_revert_checker.py b/llvm_tools/nightly_revert_checker.py
index 21dcf944..d8566c3f 100755
--- a/llvm_tools/nightly_revert_checker.py
+++ b/llvm_tools/nightly_revert_checker.py
@@ -41,7 +41,7 @@ def _find_interesting_android_shas(android_llvm_toolchain_dir: str
def get_llvm_merge_base(branch: str) -> str:
return subprocess.check_output(
- ['git', 'merge-base', branch, 'aosp/upstream-master'],
+ ['git', 'merge-base', branch, 'aosp/upstream-main'],
cwd=llvm_project,
encoding='utf-8',
).strip()