Revert "Fix shallow clones when upstream attribute is present"
This reverts commit d9cc0a15265299b6dcfc1d65f192fd14cfb17b02.
Reason for revert: AttributeError: 'Project' object has no attribute 'use_superproject'
Bug: b/427093249
Change-Id: I57b285ab21f58b040e68ec14b85425f43f0abcca
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/498641
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
diff --git a/project.py b/project.py
index 73263d9..8d18e25 100644
--- a/project.py
+++ b/project.py
@@ -2411,9 +2411,7 @@
# throws an error.
revs = [f"{self.revisionExpr}^0"]
upstream_rev = None
-
- # Only check upstream when using superproject.
- if self.upstream and self.use_superproject:
+ if self.upstream:
upstream_rev = self.GetRemote().ToLocal(self.upstream)
revs.append(upstream_rev)
@@ -2425,9 +2423,7 @@
log_as_error=False,
)
- # Only verify upstream relationship for superproject scenarios
- # without affecting plain usage.
- if self.upstream and self.use_superproject:
+ if self.upstream:
self.bare_git.merge_base(
"--is-ancestor",
self.revisionExpr,