aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/primops/fetchGit.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-04-08 22:46:25 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-04-08 23:09:18 +0200
commit6a4c7fb9759dbbf5ddaf0ebd00921d0f8045f355 (patch)
tree13144d1669a7e3f361aa8df9dc8eaf4bf99a0e01 /src/libexpr/primops/fetchGit.cc
parenta9ceeeb4b0caf6891c8cd8fcbe744d3d567c1d8e (diff)
Add path flakeref variant
Unlike file://<path>, this allows the path to be a dirty Git tree, so nix build /path/to/flake:attr is a convenient way to test building a local flake.
Diffstat (limited to 'src/libexpr/primops/fetchGit.cc')
-rw-r--r--src/libexpr/primops/fetchGit.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index bbf13c87b..391308224 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -170,7 +170,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
json["uri"] = uri;
json["name"] = name;
json["rev"] = gitInfo.rev;
- json["revCount"] = gitInfo.revCount;
+ json["revCount"] = *gitInfo.revCount;
writeFile(storeLink, json.dump());
@@ -224,7 +224,7 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
mkString(*state.allocAttr(v, state.sOutPath), gitInfo.storePath, PathSet({gitInfo.storePath}));
mkString(*state.allocAttr(v, state.symbols.create("rev")), gitInfo.rev);
mkString(*state.allocAttr(v, state.symbols.create("shortRev")), gitInfo.shortRev);
- mkInt(*state.allocAttr(v, state.symbols.create("revCount")), gitInfo.revCount);
+ mkInt(*state.allocAttr(v, state.symbols.create("revCount")), gitInfo.revCount.value_or(0));
v.attrs->sort();
if (state.allowedPaths)