diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-08 13:24:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-05-08 13:26:20 +0200 |
| commit | 9d07c3717b0b5accb3923ce0920e72fb26617468 (patch) | |
| tree | 18172f483fe32679ccbc65c6d6687003dd6c8940 /src/libexpr/primops | |
| parent | b9c016abc1a533f972248e8d0739e55e623a4dcb (diff) | |
updateLockFile: Do "git add" in a slightly nicer way
"--intent-to-add" ensures the change shows up in "git diff".
Diffstat (limited to 'src/libexpr/primops')
| -rw-r--r-- | src/libexpr/primops/flake.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops/flake.cc b/src/libexpr/primops/flake.cc index 89267e2b1..b451afba4 100644 --- a/src/libexpr/primops/flake.cc +++ b/src/libexpr/primops/flake.cc @@ -417,7 +417,7 @@ void updateLockFile(EvalState & state, const FlakeUri & flakeUri) // Hack: Make sure that flake.lock is visible to Git. Otherwise, // exportGit will fail to copy it to the Nix store. runProgram("git", true, - { "-C", refData->path, "add", + { "-C", refData->path, "add", "--intent-to-add", (flakeRef.subdir == "" ? "" : flakeRef.subdir + "/") + "flake.lock" }); } else throw Error("flakeUri %s can't be updated because it is not a path", flakeUri); |