diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
| commit | ecb3a1afa2395c46c4ba2ec9da550f45414dbe6d (patch) | |
| tree | 6d1038ee909bd1ba69948a0bc326cd5ba6824e01 /src/libexpr/flake/flakeref.cc | |
| parent | ab88f4bbd4117db458a79f0a02a4de7bf7931f4c (diff) | |
| parent | f800d450b78091835ab7ca67847d76e75d877a24 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libexpr/flake/flakeref.cc')
| -rw-r--r-- | src/libexpr/flake/flakeref.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index 8e90e5989..ff7c725cb 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -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); |