diff --git a/project.py b/project.py index 8d18e2506..4379be6cc 100644 --- a/project.py +++ b/project.py @@ -2411,7 +2411,9 @@ class Project: # throws an error. revs = [f"{self.revisionExpr}^0"] upstream_rev = None - if self.upstream: + + # Only check upstream when using superproject. + if self.upstream and self.manifest.manifestProject.use_superproject: upstream_rev = self.GetRemote().ToLocal(self.upstream) revs.append(upstream_rev) @@ -2423,7 +2425,9 @@ class Project: log_as_error=False, ) - if self.upstream: + # Only verify upstream relationship for superproject scenarios + # without affecting plain usage. + if self.upstream and self.manifest.manifestProject.use_superproject: self.bare_git.merge_base( "--is-ancestor", self.revisionExpr,