Skip to content

Commit 0943f30

Browse files
Don't ignore unstaged files in local flakes
1 parent 7e301fd commit 0943f30

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/libfetchers/git.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,12 @@ std::pair<StorePath, Input> fetchFromWorkdir(ref<Store> store, Input & input, co
212212
if (fetchSettings.warnDirty)
213213
warn("Git tree '%s' is dirty", workdir);
214214

215-
auto gitOpts = Strings({ "-C", workdir, "--git-dir", gitDir, "ls-files", "-z" });
215+
auto gitOpts = Strings({ "-C", workdir, "--git-dir", gitDir, "ls-files", "--cached", "-z" });
216216
if (submodules)
217217
gitOpts.emplace_back("--recurse-submodules");
218+
else
219+
gitOpts.emplace_back("--others");
220+
gitOpts.emplace_back("--exclude-standard");
218221

219222
auto files = tokenizeString<std::set<std::string>>(
220223
runProgram("git", true, gitOpts), "\0"s);

0 commit comments

Comments
 (0)