From 0e4f1e7fba4770908235e136c5ed0a540854651e Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 8 Dec 2022 17:46:28 -0500 Subject: Use --negotiation-tip in superproject fetches. Bug: b/260645739 Change-Id: Ib0cdbb13f130b91ab14df9c60a510f1e27cca8e0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/354354 Reviewed-by: Mike Frysinger Tested-by: Joanna Wang --- git_superproject.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'git_superproject.py') diff --git a/git_superproject.py b/git_superproject.py index 8b6bbcf9..7a4ca16b 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -31,7 +31,7 @@ from typing import NamedTuple from git_command import git_require, GitCommand from git_config import RepoConfig -from git_refs import R_HEADS +from git_refs import R_HEADS, GitRefs _SUPERPROJECT_GIT_NAME = 'superproject.git' _SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml' @@ -181,6 +181,16 @@ class Superproject(object): return False cmd = ['fetch', self._remote_url, '--depth', '1', '--force', '--no-tags', '--filter', 'blob:none'] + + # Check if there is a local ref that we can pass to --negotiation-tip. + # If this is the first fetch, it does not exist yet. + # We use --negotiation-tip to speed up the fetch. Superproject branches do + # not share commits. So this lets git know it only needs to send commits + # reachable from the specified local refs. + rev_commit = GitRefs(self._work_git).get(f'refs/heads/{self.revision}') + if rev_commit: + cmd.extend(['--negotiation-tip', rev_commit]) + if self._branch: cmd += [self._branch + ':' + self._branch] p = GitCommand(None, -- cgit v1.2.3-54-g00ecf