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

Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2019-07-06 21:06:22 +02:00
commit cc218b15ba
26 changed files with 1295 additions and 59 deletions

View file

@ -112,7 +112,10 @@ GitInfo exportGit(ref<Store> store, std::string uri,
runProgram("git", true, { "init", "--bare", repoDir });
}
Path localRefFile = repoDir + "/refs/heads/" + *ref;
Path localRefFile =
ref->compare(0, 5, "refs/") == 0
? cacheDir + "/" + *ref
: cacheDir + "/refs/heads/" + *ref;
bool doFetch;
time_t now = time(0);