diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
| commit | ecb3a1afa2395c46c4ba2ec9da550f45414dbe6d (patch) | |
| tree | 6d1038ee909bd1ba69948a0bc326cd5ba6824e01 /src/libexpr/primops/fetchGit.cc | |
| parent | ab88f4bbd4117db458a79f0a02a4de7bf7931f4c (diff) | |
| parent | f800d450b78091835ab7ca67847d76e75d877a24 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libexpr/primops/fetchGit.cc')
| -rw-r--r-- | src/libexpr/primops/fetchGit.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc index a4c4b0943..80588f54f 100644 --- a/src/libexpr/primops/fetchGit.cc +++ b/src/libexpr/primops/fetchGit.cc @@ -56,7 +56,7 @@ static std::optional<GitInfo> lookupGitInfo( Path storePath = json["storePath"]; - if (store->isValidPath(storePath)) { + if (store->isValidPath(store->parseStorePath(storePath))) { GitInfo gitInfo; gitInfo.storePath = storePath; gitInfo.rev = rev; @@ -145,7 +145,7 @@ GitInfo exportGit(ref<Store> store, std::string uri, return files.count(file); }; - gitInfo.storePath = store->addToStore("source", uri, true, htSHA256, filter); + gitInfo.storePath = store->printStorePath(store->addToStore("source", uri, true, htSHA256, filter)); gitInfo.revCount = haveCommits ? std::stoull(runProgram("git", true, { "-C", uri, "rev-list", "--count", "HEAD" })) : 0; // FIXME: maybe we should use the timestamp of the last // modified dirty file? @@ -265,7 +265,7 @@ GitInfo exportGit(ref<Store> store, std::string uri, unpackTarfile(*source, tmpDir); - gitInfo.storePath = store->addToStore(name, tmpDir); + gitInfo.storePath = store->printStorePath(store->addToStore(name, tmpDir)); gitInfo.revCount = std::stoull(runProgram("git", true, { "-C", repoDir, "rev-list", "--count", gitInfo.rev.gitRev() })); gitInfo.lastModified = std::stoull(runProgram("git", true, { "-C", repoDir, "log", "-1", "--format=%ct", gitInfo.rev.gitRev() })); |