wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Merge pull request #12870 from DeterminateSystems/improve-git-error

Browse source 
Git fetcher: Improve error message for untracked files
This commit is contained in:
mergify[bot] 2025-04-02 15:39:35 +00:00 • committed by GitHub
commit 70dcd738ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libfetchers/git.cc
View file

@ -530,14 +530,20 @@ struct GitInputScheme : InputScheme
return *head; return *head;
} }
static MakeNotAllowedError makeNotAllowedError(std::string url) static MakeNotAllowedError makeNotAllowedError(std::filesystem::path repoPath)
{ {
return [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError return [repoPath{std::move(repoPath)}](const CanonPath & path) -> RestrictedPathError {
{ if (nix::pathExists(repoPath / path.rel()))
if (nix::pathExists(path.abs())) return RestrictedPathError(
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); "Path '%1%' in the repository %2% is not tracked by Git.\n"
"\n"
"To make it visible to Nix, run:\n"
"\n"
"git -C %2% add \"%1%\"",
path.rel(),
repoPath);
else 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.rel(), repoPath);
}; };
} }
@ -747,7 +753,7 @@ struct GitInputScheme : InputScheme
ref<SourceAccessor> accessor = ref<SourceAccessor> accessor =
repo->getAccessor(repoInfo.workdirInfo, repo->getAccessor(repoInfo.workdirInfo,
exportIgnore, exportIgnore,
makeNotAllowedError(repoInfo.locationToArg())); makeNotAllowedError(repoPath));
/* If the repo has submodules, return a mounted input accessor /* If the repo has submodules, return a mounted input accessor
consisting of the accessor for the top-level repo and the consisting of the accessor for the top-level repo and the