max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 16:26:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update src/libfetchers/git-utils.cc

Browse source 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
Eelco Dolstra 2024-06-12 14:41:35 +02:00 committed by GitHub
parent bd37a70d8f
commit efd4bf6533
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libfetchers/git-utils.cc
View file

@ -914,11 +914,16 @@ struct GitFileSystemObjectSinkImpl : GitFileSystemObjectSink
auto pathComponents = tokenizeString<std::vector<std::string>>(path, "/"); auto pathComponents = tokenizeString<std::vector<std::string>>(path, "/");
if (!prepareDirs(pathComponents, false)) return; if (!prepareDirs(pathComponents, false)) return;
// We can't just look up the path from the start of the root, since
// some parent directories may not have finished yet, so we compute
// a relative path that helps us find the right git_tree_builder or object.
auto relTarget = CanonPath(path).parent()->makeRelative(target); auto relTarget = CanonPath(path).parent()->makeRelative(target);
auto dir = pendingDirs.rbegin(); auto dir = pendingDirs.rbegin();
// For each ../ component at the start, go up one directory. // For each ../ component at the start, go up one directory.
// CanonPath::makeRelative() always puts all .. elements at the start,
// so they're all handled by this loop:
std::string_view relTargetLeft(relTarget); std::string_view relTargetLeft(relTarget);
while (hasPrefix(relTargetLeft, "../")) { while (hasPrefix(relTargetLeft, "../")) {
if (dir == pendingDirs.rend()) if (dir == pendingDirs.rend())