Merge pull request #2582 from LnL7/fetchgit-refs

fetchGit: allow fetching explicit refs
2019-07-02 15:44:31 +02:00
parent 5c8f477283 c8205a3413
commit 33db1d35ae
4 changed files with 43 additions and 1 deletions
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -94,7 +94,11 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
        runProgram("git", true, { "init", "--bare", cacheDir });
    }

-    Path localRefFile = cacheDir + "/refs/heads/" + *ref;
+    Path localRefFile;
+    if (ref->compare(0, 5, "refs/") == 0)
+        localRefFile = cacheDir + "/" + *ref;
+    else
+        localRefFile = cacheDir + "/refs/heads/" + *ref;

    bool doFetch;
    time_t now = time(0);