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

2019-12-11 14:53:30 +01:00
parent ab88f4bbd4 f800d450b7
commit ecb3a1afa2
119 changed files with 3905 additions and 2250 deletions
@@ -161,7 +161,7 @@ FlakeRef::FlakeRef(const std::string & uri_, bool allowRelative)
            }
            while (true) {
                if (pathExists(d.path + "/.git")) break;
-                subdir = baseNameOf(d.path) + (subdir.empty() ? "" : "/" + subdir);
+                subdir = std::string(baseNameOf(d.path)) + (subdir.empty() ? "" : "/" + subdir);
                d.path = dirOf(d.path);
                if (d.path == "/")
                    throw MissingFlake("path '%s' is not a flake (because it does not reference a Git repository)", uri);