From 52a1c9d77fa049176c8d1bc63e2085a57f690ac6 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Tue, 9 Mar 2021 14:55:48 -0800 Subject: 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 Reviewed-by: George Burgess Tested-by: George Burgess --- llvm_tools/nightly_revert_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v1.2.3