diff options
| author | Mirko Bonadei <mbonadei@chromium.org> | 2021-04-28 17:32:14 +0200 |
|---|---|---|
| committer | libyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2021-04-28 15:34:12 +0000 |
| commit | eb6e7bb63738e29efd82ea3cf2a115238a89fa51 (patch) | |
| tree | 3620ac92d6b7fb74659686b1dde7e22d97ee60f1 /tools_libyuv | |
| parent | 51c6d12e7deeb790dc8a85d1c50a942caffa516c (diff) | |
| download | libyuv-eb6e7bb63738e29efd82ea3cf2a115238a89fa51.tar.gz | |
Fix autoroller main branch.
TBR=fbarchard@chromium.org
No-Try: True
Bug: libyuv:891
Change-Id: I33c31c2c675896ac936e216b246285052f74a51b
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2854602
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Diffstat (limited to 'tools_libyuv')
| -rwxr-xr-x | tools_libyuv/autoroller/roll_deps.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index 1953532f..5b3cf8d6 100755 --- a/tools_libyuv/autoroller/roll_deps.py +++ b/tools_libyuv/autoroller/roll_deps.py @@ -366,12 +366,12 @@ def _IsTreeClean(): def _EnsureUpdatedMasterBranch(dry_run): current_branch = _RunCommand( ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])[0].splitlines()[0] - if current_branch != 'master': - logging.error('Please checkout the master branch and re-run this script.') + if current_branch != 'main': + logging.error('Please checkout the main branch and re-run this script.') if not dry_run: sys.exit(-1) - logging.info('Updating master branch...') + logging.info('Updating main branch...') _RunCommand(['git', 'pull']) @@ -384,7 +384,7 @@ def _CreateRollBranch(dry_run): def _RemovePreviousRollBranch(dry_run): active_branch, branches = _GetBranches() if active_branch == ROLL_BRANCH_NAME: - active_branch = 'master' + active_branch = 'main' if ROLL_BRANCH_NAME in branches: logging.info('Removing previous roll branch (%s)', ROLL_BRANCH_NAME) if not dry_run: @@ -444,7 +444,7 @@ def main(): 'tryjobs.')) p.add_argument('-i', '--ignore-unclean-workdir', action='store_true', default=False, - help=('Ignore if the current branch is not master or if there ' + help=('Ignore if the current branch is not main or if there ' 'are uncommitted changes (default: %(default)s).')) grp = p.add_mutually_exclusive_group() grp.add_argument('--skip-cq', action='store_true', default=False, |