Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed apply stash to pop stash

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-10-10 03:00:09 +02:00
parent ee745bd4e0
commit 0e7a682cdb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/app/git/StashManager.kt
View File

@ -23,15 +23,13 @@ class StashManager @Inject constructor() {
} }
suspend fun popStash(git: Git) = withContext(Dispatchers.IO) { suspend fun popStash(git: Git) = withContext(Dispatchers.IO) {
// val firstStash = app.git.stashList().call().firstOrNull() ?: return@withContext
git git
.stashApply() .stashApply()
// .setStashRef(firstStash.)
.call() .call()
// app.git.stashDrop() git.stashDrop()
// .setStashRef(firstStash.) .call()
loadStashList(git) loadStashList(git)
} }

2
src/main/kotlin/app/ui/GMenu.kt
View File

@ -67,7 +67,7 @@ fun GMenu(
onClick = onStash, onClick = onStash,
) )
MenuButton( MenuButton(
title = "Apply", title = "Pop",
icon = painterResource("apply_stash.svg"), icon = painterResource("apply_stash.svg"),
onClick = onPopStash, onClick = onPopStash,
) )