mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message when git is not installed

Browse Source 
When installing git dependencies without git installed, show a clear
error message directly where the error occurs.

Before:
  error: FileNotFound cloning repository for git+https://...

After:
  error: Git is not installed. Install Git to clone repository for "package"

    Learn more: https://git-scm.com/downloads

The fix checks for FileNotFound errors in repository.zig at each git
command invocation (fetch, clone, checkout, log) and logs the helpful
message right there, rather than propagating a custom error type.
This commit is contained in:
Claude Bot
2025-10-13 17:02:34 +00:00
parent 59dd5086e7
commit f6fe97aa7d
1 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/install/repository.zig
View File

@@ -370,29 +370,17 @@ pub const Repository = extern struct {
defer std_map.deinit();
const result = if (comptime Environment.isWindows)
std.process.Child.run(.{
try std.process.Child.run(.{
.allocator = allocator,
.argv = argv,
.env_map = std_map.get(),
}) catch |err| {
// FileNotFound means git executable wasn't found
if (err == error.FileNotFound and argv.len > 0 and strings.eqlComptime(argv[0], "git")) {
return error.GitNotFound;
}
return err;
}
})
else
std.process.Child.run(.{
try std.process.Child.run(.{
.allocator = allocator,
.argv = argv,
.env_map = std_map.get(),
}) catch |err| {
// FileNotFound means git executable wasn't found
if (err == error.FileNotFound and argv.len > 0 and strings.eqlComptime(argv[0], "git")) {
return error.GitNotFound;
}
return err;
};
});
switch (result.term) {
.Exited => |sig| if (sig == 0) return result.stdout else if (
@@ -510,13 +498,23 @@ pub const Repository = extern struct {
env,
&[_]string{ "git", "-C", path, "fetch", "--quiet" },
) catch |err| {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git fetch\" for \"{s}\" failed",
.{name},
) catch unreachable;
if (err == error.FileNotFound) {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"Git is not installed. Install Git to clone repository for \"{s}\"\n\n Learn more: https://git-scm.com/downloads",
.{name},
) catch unreachable;
} else {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git fetch\" for \"{s}\" failed",
.{name},
) catch unreachable;
}
return err;
};
break :fetch dir;
@@ -534,7 +532,15 @@ pub const Repository = extern struct {
url,
target,
}) catch |err| {
if (err == error.RepositoryNotFound or attempt > 1) {
if (err == error.FileNotFound) {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"Git is not installed. Install Git to clone repository for \"{s}\"\n\n Learn more: https://git-scm.com/downloads",
.{name},
) catch unreachable;
} else if (err == error.RepositoryNotFound or attempt > 1) {
log.addErrorFmt(
null,
logger.Loc.Empty,
@@ -573,13 +579,23 @@ pub const Repository = extern struct {
else
&[_]string{ "git", "-C", path, "log", "--format=%H", "-1" },
) catch |err| {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"no commit matching \"{s}\" found for \"{s}\" (but repository exists)",
.{ committish, name },
) catch unreachable;
if (err == error.FileNotFound) {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"Git is not installed. Install Git to use git dependencies\n\n Learn more: https://git-scm.com/downloads",
.{},
) catch unreachable;
} else {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"no commit matching \"{s}\" found for \"{s}\" (but repository exists)",
.{ committish, name },
) catch unreachable;
}
return err;
}, " \t\r\n");
}
@@ -611,26 +627,46 @@ pub const Repository = extern struct {
try bun.getFdPath(.fromStdDir(repo_dir), &final_path_buf),
target,
}) catch |err| {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git clone\" for \"{s}\" failed",
.{name},
) catch unreachable;
if (err == error.FileNotFound) {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"Git is not installed. Install Git to use git dependencies\n\n Learn more: https://git-scm.com/downloads",
.{},
) catch unreachable;
} else {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git clone\" for \"{s}\" failed",
.{name},
) catch unreachable;
}
return err;
};
const folder = Path.joinAbsString(PackageManager.get().cache_directory_path, &.{folder_name}, .auto);
_ = exec(allocator, env, &[_]string{ "git", "-C", folder, "checkout", "--quiet", resolved }) catch |err| {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git checkout\" for \"{s}\" failed",
.{name},
) catch unreachable;
if (err == error.FileNotFound) {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"Git is not installed. Install Git to use git dependencies\n\n Learn more: https://git-scm.com/downloads",
.{},
) catch unreachable;
} else {
log.addErrorFmt(
null,
logger.Loc.Empty,
allocator,
"\"git checkout\" for \"{s}\" failed",
.{name},
) catch unreachable;
}
return err;
};
var dir = try bun.openDir(cache_dir, folder_name);