mirrors/git-repo
1
0
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2026-01-12 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix shallow clones when upstream attribute is present"

Browse Source 
This reverts commit d9cc0a1526.

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>
This commit is contained in:
Gavin Mak
2025-08-14 16:28:12 -07:00
committed by LUCI
parent 854fe440f2
commit 38d2fe11b9
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project.py
View File

@@ -2411,9 +2411,7 @@ class Project:
# throws an error. # throws an error.
revs = [f"{self.revisionExpr}^0"] revs = [f"{self.revisionExpr}^0"]
upstream_rev = None 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) upstream_rev = self.GetRemote().ToLocal(self.upstream)
revs.append(upstream_rev) revs.append(upstream_rev)
@@ -2425,9 +2423,7 @@ class Project:
log_as_error=False, log_as_error=False,
) )
# Only verify upstream relationship for superproject scenarios if self.upstream:
# without affecting plain usage.
if self.upstream and self.use_superproject:
self.bare_git.merge_base( self.bare_git.merge_base(
"--is-ancestor", "--is-ancestor",
self.revisionExpr, self.revisionExpr,