Compare commits

...

5 commits

Author SHA1 Message Date
leo
8ddf6e87e9
enhance: set GIT_SSH_COMMAND only if it has not been provided (#544)
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
2024-10-08 16:19:03 +08:00
aikawayataro
3951549e5c
enhance: append to PATH on MacOS instead of overriding it (#546) 2024-10-08 16:07:50 +08:00
leo
9a2ea71f41
Merge branch 'master' into develop 2024-10-08 09:28:55 +08:00
leo
af888e17de
Merge branch 'release/v8.33' 2024-10-08 09:25:04 +08:00
leo
6ccdf47f99
version: Release 8.33 2024-10-08 09:24:25 +08:00
2 changed files with 9 additions and 6 deletions

View file

@ -1 +1 @@
8.32
8.33

View file

@ -188,10 +188,8 @@ namespace SourceGit.Commands
start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
// If an SSH private key was provided, sets the environment.
if (!string.IsNullOrEmpty(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");
if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
// Force using en_US.UTF-8 locale to avoid GCM crash
if (OperatingSystem.IsLinux())
@ -199,7 +197,12 @@ namespace SourceGit.Commands
// Fix sometimes `LSEnvironment` not working on macOS
if (OperatingSystem.IsMacOS())
start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
{
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");
}
// Force using this app as git editor.
switch (Editor)