From 69902d09416152629d44b5c09055f7578a7f941a Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Tue, 2 Feb 2021 21:57:55 +0000 Subject: [PATCH] Support main branch as default branch in roll-dep R=ehmaldonado@google.com Bug: 1172028 Change-Id: Ica77db151eeb48c65f62043cbe30828dfa17bf95 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2659510 Reviewed-by: Edward Lesmes Commit-Queue: Josip Sokcevic --- roll_dep.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roll_dep.py b/roll_dep.py index 371e15bffd..e1fbbdcc3c 100755 --- a/roll_dep.py +++ b/roll_dep.py @@ -169,10 +169,14 @@ def calculate_roll(full_dir, dependency, roll_to): if not head: raise Error('%s is unpinned.' % dependency) check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir) + if roll_to == 'origin/HEAD': + check_output(['git', 'remote', 'set-head', 'origin', '-a'], cwd=full_dir) + roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip() return head, roll_to + def gen_commit_msg(logs, cmdline, reviewers, bug): """Returns the final commit message.""" commit_msg = '' @@ -218,7 +222,7 @@ def main(): '--log-limit', type=int, default=100, help='Trim log after N commits (default: %(default)s)') parser.add_argument( - '--roll-to', default='origin/master', + '--roll-to', default='origin/HEAD', help='Specify the new commit to roll to (default: %(default)s)') parser.add_argument( '--key', action='append', default=[], @@ -227,7 +231,7 @@ def main(): args = parser.parse_args() if len(args.dep_path) > 1: - if args.roll_to != 'origin/master': + if args.roll_to != 'origin/HEAD': parser.error( 'Can\'t use multiple paths to roll simultaneously and --roll-to') if args.key: