add a way to fallback to system LFS

ProjectBorealis · Feb 11, 2023 · 1193981 · 1193981
1 parent 8e05302
commit 1193981
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/GitSourceControl/Private/GitSourceControlUtils.cpp b/Source/GitSourceControl/Private/GitSourceControlUtils.cpp
@@ -653,9 +653,14 @@ bool RunCommand(const FString& InCommand, const FString& InPathToGitBinary, cons
 	return bResult;
 }
 
+#ifndef GIT_USE_CUSTOM_LFS
+#define GIT_USE_CUSTOM_LFS 1
+#endif
+
 bool RunLFSCommand(const FString& InCommand, const FString& InRepositoryRoot, const TArray<FString>& InParameters, const TArray<FString>& InFiles,
 				   TArray<FString>& OutResults, TArray<FString>& OutErrorMessages)
 {
+#if GIT_USE_CUSTOM_LFS
 	FString BaseDir = IPluginManager::Get().FindPlugin("GitSourceControl")->GetBaseDir();
 #if PLATFORM_WINDOWS
 	FString LFSLockBinary = FString::Printf(TEXT("%s/git-lfs.exe"), *BaseDir);
@@ -672,7 +677,8 @@ bool RunLFSCommand(const FString& InCommand, const FString& InRepositoryRoot, co
 #elif PLATFORM_LINUX
 	FString LFSLockBinary = FString::Printf(TEXT("%s/git-lfs"), *BaseDir);
 #else
-	checkf(false, TEXT("Unhandled platform for LFS binary!"));
+	ensureMsgf(false, TEXT("Unhandled platform for LFS binary!"));
+#endif
 #endif
 
 	return GitSourceControlUtils::RunCommand(InCommand, LFSLockBinary, InRepositoryRoot, InParameters, InFiles, OutResults, OutErrorMessages);