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