Don't ignore unstaged files in local flakes

NixOS · Jun 20, 2022 · 0943f30 · 0943f30
1 parent 7e301fd
commit 0943f30
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
@@ -212,9 +212,12 @@ std::pair<StorePath, Input> fetchFromWorkdir(ref<Store> store, Input & input, co
     if (fetchSettings.warnDirty)
         warn("Git tree '%s' is dirty", workdir);
 
-    auto gitOpts = Strings({ "-C", workdir, "--git-dir", gitDir, "ls-files", "-z" });
+    auto gitOpts = Strings({ "-C", workdir, "--git-dir", gitDir, "ls-files", "--cached", "-z" });
     if (submodules)
         gitOpts.emplace_back("--recurse-submodules");
+	else
+        gitOpts.emplace_back("--others");
+        gitOpts.emplace_back("--exclude-standard");
 
     auto files = tokenizeString<std::set<std::string>>(
         runProgram("git", true, gitOpts), "\0"s);