Skip to content

Commit

Permalink
fetchgit -> fetchGit
Browse files Browse the repository at this point in the history
Almost all other primops are camelCase so no reason not to use that
here.
  • Loading branch information
edolstra committed Oct 30, 2017
1 parent 23ce4b3 commit 0493227
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/manual/release-notes/rl-1.12.xml
Expand Up @@ -184,7 +184,7 @@
</listitem>

<listitem>
<para><function>builtins.fetchgit</function>.
<para><function>builtins.fetchGit</function>.
(38539b943a060d9cdfc24d6e5d997c0885b8aa2f)</para>
</listitem>

Expand Down
8 changes: 4 additions & 4 deletions src/libexpr/primops/fetchgit.cc
Expand Up @@ -88,10 +88,10 @@ Path exportGit(ref<Store> store, const std::string & uri,
return storePath;
}

static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Value & v)
static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
// FIXME: cut&paste from fetch().
if (state.restricted) throw Error("'fetchgit' is not allowed in restricted mode");
if (state.restricted) throw Error("'fetchGit' is not allowed in restricted mode");

std::string url;
std::string ref = "master";
Expand All @@ -118,7 +118,7 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
else if (n == "name")
name = state.forceStringNoCtx(*attr.value, *attr.pos);
else
throw EvalError("unsupported argument '%s' to 'fetchgit', at %s", attr.name, *attr.pos);
throw EvalError("unsupported argument '%s' to 'fetchGit', at %s", attr.name, *attr.pos);
}

if (url.empty())
Expand All @@ -132,6 +132,6 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
mkString(v, storePath, PathSet({storePath}));
}

static RegisterPrimOp r("__fetchgit", 1, prim_fetchgit);
static RegisterPrimOp r("fetchGit", 1, prim_fetchGit);

}

0 comments on commit 0493227

Please sign in to comment.