From 398c4136c2a963a38b8d7664c47f2bd8c60e86c3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 31 Mar 2025 21:35:15 -0400
Subject: [PATCH 1/3] Improve and fix the error message when a file is not
 tracked by Git

(cherry picked from commit 62e2304891375f642ac7b52358d36455ce99171a)
---
 src/libfetchers/git.cc | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index f46334d30..5684583cd 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -534,11 +534,21 @@ struct GitInputScheme : InputScheme
 
     static MakeNotAllowedError makeNotAllowedError(std::string url)
     {
-        return [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError
-        {
-            if (nix::pathExists(path.abs()))
-                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 [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError {
+            if (nix::pathExists(url + "/" + path.abs())) {
+                auto relativePath = path.rel(); // .makeRelative(CanonPath("/"));
+
+                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);
         };
     }

From d653225a24c80def265dc813a3a4fbab652763f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 1 Apr 2025 15:14:20 +0200
Subject: [PATCH 2/3] Tweak error message

(cherry picked from commit 277c29a64b379d66fe17a0c68260481a63fdcdd2)
---
 src/libfetchers/git.cc | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index 5684583cd..6b82d9ae3 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -532,24 +532,20 @@ struct GitInputScheme : InputScheme
         return *head;
     }
 
-    static MakeNotAllowedError makeNotAllowedError(std::string url)
+    static MakeNotAllowedError makeNotAllowedError(std::filesystem::path repoPath)
     {
-        return [url{std::move(url)}](const CanonPath & path) -> RestrictedPathError {
-            if (nix::pathExists(url + "/" + path.abs())) {
-                auto relativePath = path.rel(); // .makeRelative(CanonPath("/"));
-
+        return [repoPath{std::move(repoPath)}](const CanonPath & path) -> RestrictedPathError {
+            if (nix::pathExists(repoPath / path.rel()))
                 return RestrictedPathError(
-                    "'%s' is not tracked by Git.\n"
+                    "File '%1%' in the repository %2% is not tracked by Git.\n"
                     "\n"
-                    "To use '%s', stage it in the Git repository at '%s':\n"
+                    "To make it visible to Nix, run:\n"
                     "\n"
-                    "git add %s",
-                    relativePath,
-                    relativePath,
-                    url,
-                    relativePath);
-            } else
-                return RestrictedPathError("path '%s' does not exist in Git repository '%s'", path, url);
+                    "git -C %2% add \"%1%\"",
+                    path.rel(),
+                    repoPath);
+            else
+                return RestrictedPathError("path '%s' does not exist in Git repository %s", path, repoPath);
         };
     }
 
@@ -757,7 +753,7 @@ struct GitInputScheme : InputScheme
         ref<SourceAccessor> accessor =
             repo->getAccessor(repoInfo.workdirInfo,
                 exportIgnore,
-                makeNotAllowedError(repoInfo.locationToArg()));
+                makeNotAllowedError(repoPath));
 
         /* If the repo has submodules, return a mounted input accessor
            consisting of the accessor for the top-level repo and the

From 2b4ddbbf47320bb9a0b01a74c1ec1d30687d79ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 1 Apr 2025 22:56:14 +0200
Subject: [PATCH 3/3] Make Git error messages more consistent

(cherry picked from commit f15681df26bbbf246c226530d1ab814a172a7e87)
---
 src/libfetchers/git.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index 6b82d9ae3..6f6fdd3a3 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -537,7 +537,7 @@ struct GitInputScheme : InputScheme
         return [repoPath{std::move(repoPath)}](const CanonPath & path) -> RestrictedPathError {
             if (nix::pathExists(repoPath / path.rel()))
                 return RestrictedPathError(
-                    "File '%1%' in the repository %2% is not tracked by Git.\n"
+                    "Path '%1%' in the repository %2% is not tracked by Git.\n"
                     "\n"
                     "To make it visible to Nix, run:\n"
                     "\n"
@@ -545,7 +545,7 @@ struct GitInputScheme : InputScheme
                     path.rel(),
                     repoPath);
             else
-                return RestrictedPathError("path '%s' does not exist in Git repository %s", path, repoPath);
+                return RestrictedPathError("Path '%s' does not exist in Git repository %s.", path.rel(), repoPath);
         };
     }