diff --git a/src/main/kotlin/app/git/StashManager.kt b/src/main/kotlin/app/git/StashManager.kt index fdc8b1f..3243f4c 100644 --- a/src/main/kotlin/app/git/StashManager.kt +++ b/src/main/kotlin/app/git/StashManager.kt @@ -23,15 +23,13 @@ class StashManager @Inject constructor() { } suspend fun popStash(git: Git) = withContext(Dispatchers.IO) { -// val firstStash = app.git.stashList().call().firstOrNull() ?: return@withContext git .stashApply() -// .setStashRef(firstStash.) .call() - -// app.git.stashDrop() -// .setStashRef(firstStash.) + + git.stashDrop() + .call() loadStashList(git) } diff --git a/src/main/kotlin/app/ui/GMenu.kt b/src/main/kotlin/app/ui/GMenu.kt index 5657af4..a543044 100644 --- a/src/main/kotlin/app/ui/GMenu.kt +++ b/src/main/kotlin/app/ui/GMenu.kt @@ -67,7 +67,7 @@ fun GMenu( onClick = onStash, ) MenuButton( - title = "Apply", + title = "Pop", icon = painterResource("apply_stash.svg"), onClick = onPopStash, )