wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 23:11:16 +02:00
Code Activity

Fix assertion failure in FlakeRef::to_string()

Browse source
This commit is contained in:
Eelco Dolstra 2019-04-19 11:16:14 +02:00
parent 6e4210d8ce
commit 46cb15df9b
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/primops/fetchGit.cc
View file

@ -39,6 +39,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
files. */
GitInfo gitInfo;
gitInfo.ref = "HEAD";
gitInfo.rev = "0000000000000000000000000000000000000000";
gitInfo.shortRev = std::string(gitInfo.rev, 0, 7);
@ -67,7 +68,6 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
// clean working tree, but no ref or rev specified. Use 'HEAD'.
rev = chomp(runProgram("git", true, { "-C", uri, "rev-parse", "HEAD" }));
ref = "HEAD"s;
}
if (!ref) ref = "HEAD"s;
@ -127,6 +127,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
// FIXME: check whether rev is an ancestor of ref.
GitInfo gitInfo;
gitInfo.ref = *ref;
gitInfo.rev = rev != "" ? rev : chomp(readFile(localRefFile));
gitInfo.shortRev = std::string(gitInfo.rev, 0, 7);