|
@@ -7,7 +7,6 @@ using System;
|
|
|
using CliWrap;
|
|
|
using System.IO;
|
|
|
using System.Linq;
|
|
|
-using UnityEngine;
|
|
|
using System.Text;
|
|
|
using UnityEngine.Scripting;
|
|
|
using System.Threading.Tasks;
|
|
@@ -23,7 +22,7 @@ namespace Terra.Arbitrator.Services
|
|
|
internal static class GitCommand
|
|
|
{
|
|
|
private static string _projectRoot;
|
|
|
- private static string ProjectRoot => _projectRoot ??= Directory.GetParent(Application.dataPath)?.FullName;
|
|
|
+ private static string ProjectRoot => _projectRoot ??= MainThreadDataCache.ProjectRoot;
|
|
|
|
|
|
/// <summary>
|
|
|
/// Runs a git command asynchronously.
|
|
@@ -33,7 +32,7 @@ namespace Terra.Arbitrator.Services
|
|
|
/// <param name="progress">A delegate to report real-time standard error lines.</param>
|
|
|
/// <param name="args">The arguments to pass to the git command.</param>
|
|
|
/// <param name="acceptableExitCodes">A list of exit codes that should not be treated as errors.</param>
|
|
|
- public static async Task RunAsync(string execPath, StringBuilder log, IProgress<string> progress, string[] args, params int[] acceptableExitCodes)
|
|
|
+ private static async Task RunAsync(string execPath, StringBuilder log, IProgress<string> progress, string[] args, params int[] acceptableExitCodes)
|
|
|
{
|
|
|
var stdOutBuffer = new StringBuilder();
|
|
|
var stdErrBuffer = new StringBuilder();
|