Call Git cmd_main directly

2026-06-24 13:16:35 -05:00
parent a9d7b0cfc0
commit 0554c736e4
26 changed files with 1141 additions and 661 deletions
--- a/app/src/main/java/solutions/tretter/githugandroid/levels/FetchLevel.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/levels/FetchLevel.kt
@@ -41,15 +41,13 @@ internal fun fetchLevel(): Level = level(
        true
    },
    validator = repoPredicate { repo ->
-        repo.branches.size == 1 &&
-            repo.fetchHeadCount == 2 &&
-            "pull" !in repo.maintenanceActions
+        repo.branches.keys == setOf("master") &&
+            repo.fetchHeadCount >= 2 &&
+            "origin/new_branch" in repo.fetchedBranches &&
+            repo.files.none { it.name == "file1" && it.tracked }
    },
    testCases = listOf(
        levelTestCase("fetch origin", "git fetch origin"),
        levelTestCase("fetch default", "git fetch"),
    ),
-    negativeTestCases = listOf(
-        levelTestCase("pulling does not solve fetch", "git pull"),
-    ),
 )