From bc259192b4e1f90c575ddc83814b82cca829a4f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 19 Apr 2019 14:15:51 +0200
Subject: [PATCH] fetchGit: Return revCount for dirty working trees

---
 src/libexpr/primops/fetchGit.cc | 5 +++--
 src/libexpr/primops/fetchGit.hh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index eb95208de..e79eacafe 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -68,6 +68,7 @@ GitInfo exportGit(ref<Store> store, std::string uri,
             };
 
             gitInfo.storePath = store->addToStore("source", uri, true, htSHA256, filter);
+            gitInfo.revCount = std::stoull(runProgram("git", true, { "-C", uri, "rev-list", "--count", "HEAD" }));
 
             return gitInfo;
         }
@@ -200,7 +201,7 @@ GitInfo exportGit(ref<Store> store, std::string uri,
     json["uri"] = uri;
     json["name"] = name;
     json["rev"] = gitInfo.rev.gitRev();
-    json["revCount"] = *gitInfo.revCount;
+    json["revCount"] = gitInfo.revCount;
 
     writeFile(storeLink, json.dump());
 
@@ -254,7 +255,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.gitRev());
     mkString(*state.allocAttr(v, state.symbols.create("shortRev")), gitInfo.rev.gitShortRev());
-    mkInt(*state.allocAttr(v, state.symbols.create("revCount")), gitInfo.revCount.value_or(0));
+    mkInt(*state.allocAttr(v, state.symbols.create("revCount")), gitInfo.revCount);
     v.attrs->sort();
 
     if (state.allowedPaths)
diff --git a/src/libexpr/primops/fetchGit.hh b/src/libexpr/primops/fetchGit.hh
index 32e748f98..2ad6a5e5c 100644
--- a/src/libexpr/primops/fetchGit.hh
+++ b/src/libexpr/primops/fetchGit.hh
@@ -11,7 +11,7 @@ struct GitInfo
     Path storePath;
     std::string ref;
     Hash rev{htSHA1};
-    std::optional<uint64_t> revCount;
+    uint64_t revCount;
 };
 
 GitInfo exportGit(ref<Store> store, std::string uri,