diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2411,7 +2411,9 @@ class Project: | |||
2411 | # throws an error. | 2411 | # throws an error. |
2412 | revs = [f"{self.revisionExpr}^0"] | 2412 | revs = [f"{self.revisionExpr}^0"] |
2413 | upstream_rev = None | 2413 | upstream_rev = None |
2414 | if self.upstream: | 2414 | |
2415 | # Only check upstream when using superproject. | ||
2416 | if self.upstream and self.manifest.manifestProject.use_superproject: | ||
2415 | upstream_rev = self.GetRemote().ToLocal(self.upstream) | 2417 | upstream_rev = self.GetRemote().ToLocal(self.upstream) |
2416 | revs.append(upstream_rev) | 2418 | revs.append(upstream_rev) |
2417 | 2419 | ||
@@ -2423,7 +2425,9 @@ class Project: | |||
2423 | log_as_error=False, | 2425 | log_as_error=False, |
2424 | ) | 2426 | ) |
2425 | 2427 | ||
2426 | if self.upstream: | 2428 | # Only verify upstream relationship for superproject scenarios |
2429 | # without affecting plain usage. | ||
2430 | if self.upstream and self.manifest.manifestProject.use_superproject: | ||
2427 | self.bare_git.merge_base( | 2431 | self.bare_git.merge_base( |
2428 | "--is-ancestor", | 2432 | "--is-ancestor", |
2429 | self.revisionExpr, | 2433 | self.revisionExpr, |