sourcegit: 2025.25 -> 2025.29 (#430897)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
|
||||
index a24f1b6..4102274 100644
|
||||
index f6eb4eb..1840db7 100644
|
||||
--- a/src/Native/Linux.cs
|
||||
+++ b/src/Native/Linux.cs
|
||||
@@ -97,7 +97,7 @@ namespace SourceGit.Native
|
||||
@@ -119,7 +119,7 @@ namespace SourceGit.Native
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,21 +10,26 @@ index a24f1b6..4102274 100644
|
||||
+ public static string FindExecutable(string filename)
|
||||
{
|
||||
var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
|
||||
var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
|
||||
var paths = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
|
||||
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
|
||||
index 5721fe8..bc2a57d 100644
|
||||
index a021a16..6b3dff0 100644
|
||||
--- a/src/Native/MacOS.cs
|
||||
+++ b/src/Native/MacOS.cs
|
||||
@@ -25,13 +25,7 @@ namespace SourceGit.Native
|
||||
@@ -46,18 +46,7 @@ namespace SourceGit.Native
|
||||
|
||||
public string FindGitExecutable()
|
||||
{
|
||||
- var gitPathVariants = new List<string>() {
|
||||
- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
|
||||
- "/usr/bin/git",
|
||||
- "/usr/local/bin/git",
|
||||
- "/opt/homebrew/bin/git",
|
||||
- "/opt/homebrew/opt/git/bin/git"
|
||||
- };
|
||||
-
|
||||
- foreach (var path in gitPathVariants)
|
||||
- if (File.Exists(path))
|
||||
- return path;
|
||||
-
|
||||
- return string.Empty;
|
||||
+ return Linux.FindExecutable("git");
|
||||
}
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "sourcegit";
|
||||
version = "2025.25";
|
||||
version = "2025.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegit-scm";
|
||||
repo = "sourcegit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WPwvOfbCOCQBOvJU2HuGU9/Rh00MCmhZEaKn9Nr1Q0I=";
|
||||
hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-darwin-git-path.patch ];
|
||||
|
||||
Reference in New Issue
Block a user