diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-01-09T15·49+0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09T15·49+0100 |
| commit | 3cd0704387eb10c4104ba06309ed38a6670b5660 (patch) | |
| tree | affea3f6ff5060fa5569dbfcfe3f0f6fc28b0696 | |
| parent | 7b9583680e9e1be1df2a5cd0d71ed8f9a7d45fad (diff) | |
| parent | 428680b3076a01f278ed629aa3b1744d11a2c231 (diff) | |
Merge pull request #1787 from dtzWill/fix/git-not-on-PATH
fix git cache 'corruption' when git not available, breaks all future use of fetchGit
| -rw-r--r-- | src/libexpr/primops/fetchGit.cc | 1 | ||||
| -rw-r--r-- | tests/fetchGit.sh | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc index 0d0b11958a4b..fb664cffb5b7 100644 --- a/src/libexpr/primops/fetchGit.cc +++ b/src/libexpr/primops/fetchGit.cc @@ -85,7 +85,6 @@ GitInfo exportGit(ref<Store> store, const std::string & uri, Path cacheDir = getCacheDir() + "/nix/git"; if (!pathExists(cacheDir)) { - createDirs(cacheDir); runProgram("git", true, { "init", "--bare", cacheDir }); } diff --git a/tests/fetchGit.sh b/tests/fetchGit.sh index 65d673c08854..b556fe594ce4 100644 --- a/tests/fetchGit.sh +++ b/tests/fetchGit.sh @@ -119,3 +119,16 @@ path4=$(nix eval --raw "(builtins.fetchGit $repo).outPath") # Confirm same as 'dev' branch path5=$(nix eval --raw "(builtins.fetchGit { url = $repo; ref = \"dev\"; }).outPath") [[ $path3 = $path5 ]] + + +# Nuke the cache +rm -rf $TEST_HOME/.cache/nix/git + +# Try again, but without 'git' on PATH +NIX=$(command -v nix) +# This should fail +(! PATH= $NIX eval --raw "(builtins.fetchGit { url = $repo; ref = \"dev\"; }).outPath" ) + +# Try again, with 'git' available. This should work. +path5=$(nix eval --raw "(builtins.fetchGit { url = $repo; ref = \"dev\"; }).outPath") +[[ $path3 = $path5 ]] |