mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-28 21:37:19 -08:00
Compare commits
No commits in common. "8ddf6e87e913ac890740b392491cd759be7e95ed" and "3dcb32aec98cddce317314b9909980bf57310184" have entirely different histories.
8ddf6e87e9
...
3dcb32aec9
2 changed files with 6 additions and 9 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
8.33
|
8.32
|
|
@ -188,8 +188,10 @@ namespace SourceGit.Commands
|
||||||
start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
|
start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
|
||||||
|
|
||||||
// If an SSH private key was provided, sets the environment.
|
// If an SSH private key was provided, sets the environment.
|
||||||
if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
|
if (!string.IsNullOrEmpty(SSHKey))
|
||||||
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
|
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
|
||||||
|
else
|
||||||
|
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
|
||||||
|
|
||||||
// Force using en_US.UTF-8 locale to avoid GCM crash
|
// Force using en_US.UTF-8 locale to avoid GCM crash
|
||||||
if (OperatingSystem.IsLinux())
|
if (OperatingSystem.IsLinux())
|
||||||
|
@ -197,12 +199,7 @@ namespace SourceGit.Commands
|
||||||
|
|
||||||
// Fix sometimes `LSEnvironment` not working on macOS
|
// Fix sometimes `LSEnvironment` not working on macOS
|
||||||
if (OperatingSystem.IsMacOS())
|
if (OperatingSystem.IsMacOS())
|
||||||
{
|
|
||||||
if (start.Environment.TryGetValue("PATH", out var path))
|
|
||||||
start.Environment.Add("PATH", $"/opt/homebrew/bin:/opt/homebrew/sbin:{path}");
|
|
||||||
else
|
|
||||||
start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
|
start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
|
||||||
}
|
|
||||||
|
|
||||||
// Force using this app as git editor.
|
// Force using this app as git editor.
|
||||||
switch (Editor)
|
switch (Editor)
|
||||||
|
|
Loading…
Reference in a new issue