diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt index 71d771e1..7287044e 100644 --- a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt +++ b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt @@ -130,7 +130,10 @@ object PasswordRepository { return repository } - /** Get the currently checked out branch. */ + /** + * Get the currently checked out branch. While a rebase is stopped HEAD is detached, so this + * returns the branch being rebased instead. + */ fun getCurrentBranch(): String? { val repository = repository ?: return null val headRef = repository.findRef(Constants.HEAD) ?: return null @@ -138,10 +141,20 @@ object PasswordRepository { val branchName = headRef.target.name Repository.shortenRefName(branchName) } else { - null + rebasedBranch(repository.directory) } } + /** Branch recorded by an in-progress rebase in [gitDir], or null when no rebase is running. */ + fun rebasedBranch(gitDir: File): String? = + listOf("rebase-merge", "rebase-apply") + .map { gitDir.resolve(it).resolve("head-name") } + .firstOrNull { it.isFile } + ?.readText() + ?.trim() + ?.takeIf { it.startsWith(Constants.R_HEADS) } + ?.let(Repository::shortenRefName) + /** * Gets the .gpg files in a directory * |