summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto Vladimir Prado Carranza <roberto.prado.c@gmail.com>2023-09-13 10:27:26 +0200
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-10-20 12:34:34 +0000
commit3d58d219cbdf046677f8e88c488e085660488f06 (patch)
treea4b0753729cc1adfb0fc6f84e32d955fef63b552
parentc0aad7de18d281b98b7f13eb7928b206a5bd48b4 (diff)
downloadgit-repo-3d58d219cbdf046677f8e88c488e085660488f06.tar.gz
project: using --depth results in error when including submanifests
Fix: https://issues.gerritcodereview.com/issues/40015442 Change-Id: I7fb6c50cf2e438b21181ce1a5893885f09b9ee2b Signed-off-by: Roberto Vladimir Prado Carranza <roberto.prado.c@gmail.com> Signed-off-by: Guillaume Micouin-Jorda <gmicouin@netcourrier.com> Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/385995 Commit-Queue: Mike Frysinger <vapier@google.com> Reviewed-by: Mike Frysinger <vapier@google.com> Reviewed-by: Jerome Couto <jerome.couto@renault.com>
-rw-r--r--project.py2
-rw-r--r--tests/test_project.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/project.py b/project.py
index c91ae217..93d9dcba 100644
--- a/project.py
+++ b/project.py
@@ -3982,7 +3982,7 @@ class ManifestProject(MetaProject):
3982 @property 3982 @property
3983 def depth(self): 3983 def depth(self):
3984 """Partial clone depth.""" 3984 """Partial clone depth."""
3985 return self.config.GetString("repo.depth") 3985 return self.config.GetInt("repo.depth")
3986 3986
3987 @property 3987 @property
3988 def clone_filter(self): 3988 def clone_filter(self):
diff --git a/tests/test_project.py b/tests/test_project.py
index 42f0f6e5..83cfe0a4 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -507,7 +507,10 @@ class ManifestPropertiesFetchedCorrectly(unittest.TestCase):
507 self.assertFalse(fakeproj.partial_clone) 507 self.assertFalse(fakeproj.partial_clone)
508 508
509 fakeproj.config.SetString("repo.depth", "48") 509 fakeproj.config.SetString("repo.depth", "48")
510 self.assertEqual(fakeproj.depth, "48") 510 self.assertEqual(fakeproj.depth, 48)
511
512 fakeproj.config.SetString("repo.depth", "invalid_depth")
513 self.assertEqual(fakeproj.depth, None)
511 514
512 fakeproj.config.SetString("repo.clonefilter", "blob:limit=10M") 515 fakeproj.config.SetString("repo.clonefilter", "blob:limit=10M")
513 self.assertEqual(fakeproj.clone_filter, "blob:limit=10M") 516 self.assertEqual(fakeproj.clone_filter, "blob:limit=10M")