wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 19:57:59 +02:00
Code Activity

Improve and fix the error message when a file is not tracked by Git

Browse source
This commit is contained in:
Graham Christensen 2025-03-31 21:35:15 -04:00 • committed by Eelco Dolstra
parent cf409fd250
commit 62e2304891
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libfetchers/git.cc
View file

@ -532,11 +532,21 @@ struct GitInputScheme : InputScheme
static MakeNotAllowedError makeNotAllowedError(std::string url) static MakeNotAllowedError makeNotAllowedError(std::string url)
{ {
return [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError return [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError {
{ if (nix::pathExists(url + "/" + path.abs())) {
if (nix::pathExists(path.abs())) auto relativePath = path.rel(); // .makeRelative(CanonPath("/"));
return RestrictedPathError("access to path '%s' is forbidden because it is not under Git control; maybe you should 'git add' it to the repository '%s'?", path, url);
else return RestrictedPathError(
"'%s' is not tracked by Git.\n"
"\n"
"To use '%s', stage it in the Git repository at '%s':\n"
"\n"
"git add %s",
relativePath,
relativePath,
url,
relativePath);
} else
return RestrictedPathError("path '%s' does not exist in Git repository '%s'", path, url); return RestrictedPathError("path '%s' does not exist in Git repository '%s'", path, url);
}; };
} }