Revert^2 "Fix shallow clones when upstream attribute is present"
This reverts commit 38d2fe11b9
.
Reason for revert: Fix the issue described in I00acd4c61
Bug: b/427093249
Change-Id: Ife6d46cd85840f2989f60c2ca4d5a7dcf5d7477a
This commit is contained in:
parent
38d2fe11b9
commit
a21f029ec9
1 changed files with 6 additions and 2 deletions
|
@ -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.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.use_superproject:
|
||||
self.bare_git.merge_base(
|
||||
"--is-ancestor",
|
||||
self.revisionExpr,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue