From 99112d6c7977c8248d370165ed464a8af2d88e91 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 19 Sep 2021 11:50:04 -0400 Subject: [PATCH] msubprojects: when revision is an available commit, do not fetch updates It's not even worth bothering to contact the network because it can never be anything other than what we have already. --- mesonbuild/msubprojects.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index c9081ba5b..dfcff0129 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -248,7 +248,13 @@ class Runner: self.log(mlog.red(e.output)) self.log(mlog.red(str(e))) return False - if True: + if self.wrap_resolver.is_git_full_commit_id(revision) and \ + quiet_git(['rev-parse', '--verify', revision + '^{commit}'], self.repo_dir)[0]: + # The revision we need is both a commit and available. So we do not + # need to fetch it because it cannot be updated. Instead, trick + # git into setting FETCH_HEAD just in case, from the local commit. + self.git_output(['fetch', '.', revision]) + else: try: # Fetch only the revision we need, this avoids fetching useless branches. # revision can be either a branch, tag or commit id. In all cases we want