From 67383bdba9105203ffeaef645fa8c53b7ca33ac8 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Tue, 9 Sep 2025 13:14:34 -0700 Subject: [PATCH] Follow up "Fix shallow clones when upstream attribute is present" This reverts commit 38d2fe11b9df521727fcca23c9dac086ce8378d3. Reason for revert: The issue described in I00acd4c61 remains unresolved. The previous fix incorrectly accessed use_superproject from the Project class, though it was only defined in ManifestProject. This change uses it from the manifest attr available in the Project class. Bug: b/427093249 Change-Id: Ife6d46cd85840f2989f60c2ca4d5a7dcf5d7477a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/508821 Reviewed-by: Xin Li Reviewed-by: Krzysztof Wesolowski Commit-Queue: Kaushik Lingarkar Reviewed-by: Gavin Mak Tested-by: Kaushik Lingarkar --- project.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/project.py b/project.py index 8d18e2506..4379be6cc 100644 --- a/project.py +++ b/project.py @@ -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.manifest.manifestProject.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.manifest.manifestProject.use_superproject: self.bare_git.merge_base( "--is-ancestor", self.revisionExpr,