diff --git a/.pick_status.json b/.pick_status.json index 40b8be1dbe6..819aedc1157 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -49,7 +49,7 @@ "description": "bin/pick: Rename master branch to main", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/bin/pick/core.py b/bin/pick/core.py index 9b8926224b8..cc0b00f4d40 100644 --- a/bin/pick/core.py +++ b/bin/pick/core.py @@ -196,9 +196,9 @@ class Commit: async def get_new_commits(sha: str) -> typing.List[typing.Tuple[str, str]]: - # Try to get the authoritative upstream master + # Try to get the authoritative upstream main p = await asyncio.create_subprocess_exec( - 'git', 'for-each-ref', '--format=%(upstream)', 'refs/heads/master', + 'git', 'for-each-ref', '--format=%(upstream)', 'refs/heads/main', stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.DEVNULL) out, _ = await p.communicate()