lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix 'git add' when subdir is empty

Browse source
This commit is contained in:
Eelco Dolstra 2019-05-03 13:15:13 +02:00
parent 2aafa6901e
commit f8c4742c2f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops/flake.cc
View file

@ -430,7 +430,9 @@ 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", flakeRef.subdir + "/flake.lock" });
runProgram("git", true,
{ "-C", refData->path, "add",
(flakeRef.subdir == "" ? "" : flakeRef.subdir + "/") + "flake.lock" });
} else
throw Error("flakeUri %s can't be updated because it is not a path", flakeUri);
}