mirror of
https://github.com/NixOS/nix.git
synced 2025-11-29 05:31:00 +01:00
Merge remote-tracking branch 'origin/master' into lazy-trees
This commit is contained in:
commit
37d859ba22
2 changed files with 2 additions and 4 deletions
|
|
@ -254,7 +254,7 @@ struct GitInputScheme : InputScheme
|
|||
writeFile(absPath.abs(), contents);
|
||||
|
||||
runProgram("git", true,
|
||||
{ "-C", repoInfo.url, "--git-dir", repoInfo.gitDir, "add", "--force", "--intent-to-add", "--", std::string(path.rel()) });
|
||||
{ "-C", repoInfo.url, "--git-dir", repoInfo.gitDir, "add", "--intent-to-add", "--", std::string(path.rel()) });
|
||||
|
||||
if (commitMsg)
|
||||
runProgram("git", true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue