aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-07 15:44:32 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-07 15:44:32 +0200
commita15f9b37eba805c2b3bd37844c0a527b14774bba (patch)
treebaa29fe9c2e7f0e042baf3a373b8ad64b71c1e3e /src
parentce2c755d2aa4d970c2de8f00f9ed2099ad991255 (diff)
fetchGit: Support Git trees without any commits
Fixes $ nix build fatal: bad revision 'HEAD' error: program 'git' failed with exit code 128 on a new flake. It is now detected as a dirty tree with revCount = 0.
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/primops/fetchGit.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index 64f138195..21fa025c1 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -33,13 +33,19 @@ GitInfo exportGit(ref<Store> store, std::string uri,
// or revision is given, then allow the use of an unclean working
// tree.
if (!ref && !rev && isLocal) {
- bool clean = true;
+ bool clean = false;
+
+ /* Check whether this repo has any commits. There are
+ probably better ways to do this. */
+ bool haveCommits = !readDirectory(uri + "/.git/refs/heads").empty();
try {
- runProgram("git", true, { "-C", uri, "diff-index", "--quiet", "HEAD", "--" });
+ if (haveCommits) {
+ runProgram("git", true, { "-C", uri, "diff-index", "--quiet", "HEAD", "--" });
+ clean = true;
+ }
} catch (ExecError & e) {
if (!WIFEXITED(e.status) || WEXITSTATUS(e.status) != 1) throw;
- clean = false;
}
if (!clean) {
@@ -75,10 +81,10 @@ 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" }));
+ gitInfo.revCount = haveCommits ? std::stoull(runProgram("git", true, { "-C", uri, "rev-list", "--count", "HEAD" })) : 0;
// FIXME: maybe we should use the timestamp of the last
// modified dirty file?
- gitInfo.lastModified = std::stoull(runProgram("git", true, { "-C", uri, "show", "-s", "--format=%ct", "HEAD" }));
+ gitInfo.lastModified = haveCommits ? std::stoull(runProgram("git", true, { "-C", uri, "show", "-s", "--format=%ct", "HEAD" })) : 0;
return gitInfo;
}