diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-10-16T19·22+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16T19·22+0200 |
| commit | be59f077992aab68c77bf04e14caf8d8472df66f (patch) | |
| tree | db2c90e2456b56edaca2487ac5eeb4d118e96b13 | |
| parent | 1dd29d7aebae706f3e90a18bbfae727f2ed03c70 (diff) | |
| parent | 4e58294ae62075fae1a2e82e1f62f627c2a0bd80 (diff) | |
Merge pull request #1601 from shlevy/fetchgit-no-uri-check
fetchgit: Remove incomplete/unneeded isURI check.
| -rw-r--r-- | src/libexpr/primops/fetchgit.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc index e16c8235378d..545954f58430 100644 --- a/src/libexpr/primops/fetchgit.cc +++ b/src/libexpr/primops/fetchgit.cc @@ -13,9 +13,6 @@ namespace nix { Path exportGit(ref<Store> store, const std::string & uri, const std::string & ref, const std::string & rev) { - if (!isUri(uri)) - throw EvalError(format("'%s' is not a valid URI") % uri); - if (rev != "") { std::regex revRegex("^[0-9a-fA-F]{40}$"); if (!std::regex_match(rev, revRegex)) @@ -47,7 +44,7 @@ Path exportGit(ref<Store> store, const std::string & uri, if (stat(localRefFile.c_str(), &st) != 0 || st.st_mtime < now - settings.tarballTtl) { - runProgram("git", true, { "-C", cacheDir, "fetch", "--force", uri, ref + ":" + localRef }); + runProgram("git", true, { "-C", cacheDir, "fetch", "--force", "--", uri, ref + ":" + localRef }); struct timeval times[2]; times[0].tv_sec = now; |