mirror of
https://github.com/NixOS/nix
synced 2025-06-26 20:01:15 +02:00
Move some stuff from Settings
to a new FetchSettings
.
Starting work on #5638 The exact boundary between `FetchSettings` and `EvalSettings` is not clear to me, but that's fine. First lets clean out `libstore`, and then worry about what, if anything, should be the separation between those two.
This commit is contained in:
parent
1c985428c4
commit
ea71da395f
9 changed files with 128 additions and 83 deletions
|
@ -6,6 +6,8 @@
|
|||
#include "url-parts.hh"
|
||||
#include "pathlocks.hh"
|
||||
|
||||
#include "fetch-settings.hh"
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
|
@ -246,10 +248,10 @@ struct GitInputScheme : InputScheme
|
|||
|
||||
/* This is an unclean working tree. So copy all tracked files. */
|
||||
|
||||
if (!settings.allowDirty)
|
||||
if (!fetchSettings.allowDirty)
|
||||
throw Error("Git tree '%s' is dirty", actualUrl);
|
||||
|
||||
if (settings.warnDirty)
|
||||
if (fetchSettings.warnDirty)
|
||||
warn("Git tree '%s' is dirty", actualUrl);
|
||||
|
||||
auto gitOpts = Strings({ "-C", actualUrl, "ls-files", "-z" });
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue