Merge remote-tracking branch 'origin/master' into flakes

2019-11-04 22:29:31 +01:00
parent e34b317bbf f5a46ef0b1
commit b81d9d26f5
39 changed files with 995 additions and 923 deletions
@@ -115,8 +115,7 @@ GitInfo exportGit(ref<Store> store, std::string uri,

        if (!clean) {

-            /* This is an unclean working tree. So copy all tracked
-               files. */
+            /* This is an unclean working tree. So copy all tracked files. */

            if (!evalSettings.allowDirty)
                throw Error("Git tree '%s' is dirty", uri);