Skip to content

Commit 38d2fe1

Browse files
gavinmakLUCI
authored andcommitted
Revert "Fix shallow clones when upstream attribute is present"
This reverts commit d9cc0a1. 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 <[email protected]> Tested-by: Gavin Mak <[email protected]> Commit-Queue: Gavin Mak <[email protected]>
1 parent 854fe44 commit 38d2fe1

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

project.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,9 +2411,7 @@ def _CheckForImmutableRevision(self):
24112411
# throws an error.
24122412
revs = [f"{self.revisionExpr}^0"]
24132413
upstream_rev = None
2414-
2415-
# Only check upstream when using superproject.
2416-
if self.upstream and self.use_superproject:
2414+
if self.upstream:
24172415
upstream_rev = self.GetRemote().ToLocal(self.upstream)
24182416
revs.append(upstream_rev)
24192417

@@ -2425,9 +2423,7 @@ def _CheckForImmutableRevision(self):
24252423
log_as_error=False,
24262424
)
24272425

2428-
# Only verify upstream relationship for superproject scenarios
2429-
# without affecting plain usage.
2430-
if self.upstream and self.use_superproject:
2426+
if self.upstream:
24312427
self.bare_git.merge_base(
24322428
"--is-ancestor",
24332429
self.revisionExpr,

0 commit comments

Comments
 (0)