diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2023-11-27 11:34:12 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2023-11-27 17:40:11 +0530 |
| commit | a9b0112279bca0f19a2d8756d2fa4498936660dd (patch) | |
| tree | d8f065cc043cc0c84171babf28ac37456a101584 /app/src/main | |
| parent | f8230043189e037c8b4d46373e6077e91c1c4f93 (diff) | |
fix(deps): upgrade to JGit 4.5.7.201904151645-r
Currently requires deleting and re-cloning the repository to properly
detect symlink support, this will be fixed in the future to auto-detect
on existing repositories as well.
Fixes #2594
Fixes #2396
Fixes #636
Fixes #387
Fixes #98
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt | 2 |
2 files changed, 2 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 454054cf..39c6b384 100644 --- a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt +++ b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt @@ -133,7 +133,7 @@ object PasswordRepository { /** Get the currently checked out branch. */ fun getCurrentBranch(): String? { val repository = repository ?: return null - val headRef = repository.getRef(Constants.HEAD) ?: return null + val headRef = repository.findRef(Constants.HEAD) ?: return null return if (headRef.isSymbolic) { val branchName = headRef.target.name Repository.shortenRefName(branchName) diff --git a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt index 1411389f..d7584e69 100644 --- a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt @@ -158,7 +158,7 @@ class GitConfigActivity : BaseGitActivity() { */ private fun headStatusMsg(repo: Repository): String { return runCatching { - val headRef = repo.getRef(Constants.HEAD) + val headRef = repo.findRef(Constants.HEAD) if (headRef.isSymbolic) { val branchName = headRef.target.name val shortBranchName = Repository.shortenRefName(branchName) |