joe/Githug-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc Changes

Browse Source
This commit is contained in:
Joe Tretter
2026-05-11 19:19:51 -05:00
parent 8f829fb969
commit 7e55084815
7 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/solutions/tretter/githugandroid/GitSandboxEngine.kt
View File

@@ -62,7 +62,10 @@ object GitSandboxEngine {
}
parts.size >= 2 && parts[1] == "fetch" -> {
val remote = parts.getOrNull(2)?.takeIf { !it.startsWith("-") } ?: "origin"
repo.copy(fetchedBranches = repo.fetchedBranches + listOf("$remote/master", "$remote/feature_branch")) to emptyList()
repo.copy(
fetchedBranches = repo.fetchedBranches + listOf("$remote/master", "$remote/feature_branch", "$remote/new_branch"),
maintenanceActions = repo.maintenanceActions + "fetch",
) to emptyList()
}
parts.size >= 2 && parts[1] == "pull" -> {
val remote = parts.getOrNull(2)?.takeIf { !it.startsWith("-") } ?: "origin"
@@ -454,7 +457,7 @@ object GitSandboxEngine {
}
return repo.copy(
files = files,
maintenanceActions = if (squash) repo.maintenanceActions + "merge-squash" else repo.maintenanceActions,
maintenanceActions = repo.maintenanceActions + if (squash) "merge-squash" else "merge",
) to emptyList()
}