From fcf4732bf1b06bdb5cab84917a9b7c0c5c929c15 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sun, 11 Jun 2023 20:44:16 +0200 Subject: [PATCH] Fixed submodules not opening on windows Fixes #125 --- .../gitnuro/git/repository/OpenSubmoduleRepositoryUseCase.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenSubmoduleRepositoryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenSubmoduleRepositoryUseCase.kt index a8baac2..ab4f499 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenSubmoduleRepositoryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenSubmoduleRepositoryUseCase.kt @@ -1,6 +1,7 @@ package com.jetpackduba.gitnuro.git.repository import com.jetpackduba.gitnuro.exceptions.InvalidDirectoryException +import com.jetpackduba.gitnuro.system.systemSeparator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.lib.Repository @@ -17,7 +18,7 @@ class OpenSubmoduleRepositoryUseCase @Inject constructor( val repository = openRepositoryUseCase(parent) - val submoduleRelativePath = directory.absolutePath.removePrefix("${repository.directory.parent}/") + val submoduleRelativePath = directory.absolutePath.removePrefix("${repository.directory.parent}$systemSeparator") return@withContext SubmoduleWalk.getSubmoduleRepository(repository, submoduleRelativePath) ?: throw InvalidDirectoryException("Invalid submodule directory. Check if the submodule has been initialized before trying to open it.")