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