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

5
app/src/main/java/solutions/tretter/githugandroid/GitRuntime.kt
View File

@@ -740,7 +740,8 @@ class GitRepositoryRuntime private constructor(
"fetch" -> {
val remote = tokens.getOrNull(2)?.takeIf { !it.startsWith("-") } ?: "origin"
inspectedRepo.copy(
fetchedBranches = inspectedRepo.fetchedBranches + previousRepo.fetchedBranches + "$remote/master" + "$remote/feature_branch",
fetchedBranches = inspectedRepo.fetchedBranches + previousRepo.fetchedBranches + "$remote/master" + "$remote/feature_branch" + "$remote/new_branch",
maintenanceActions = inspectedRepo.maintenanceActions + previousRepo.maintenanceActions + "fetch",
)
}
"pull" -> {
@@ -788,7 +789,7 @@ class GitRepositoryRuntime private constructor(
maintenanceActions = if ("--squash" in tokens) {
inspectedRepo.maintenanceActions + previousRepo.maintenanceActions + "merge-squash"
} else {
inspectedRepo.maintenanceActions + previousRepo.maintenanceActions
inspectedRepo.maintenanceActions + previousRepo.maintenanceActions + "merge"
},
)
else -> inspectedRepo.copy(