wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
Leandro Emmanuel Reina Kiperman 2024-12-09 19:02:50 +01:00 • committed by GitHub
parent 65f78f70d2
commit 140b34b7ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libfetchers/git-lfs-fetch.hh
View file

@ -313,7 +313,7 @@ std::optional<Md> parseLfsMetadata(const std::string & content, const std::strin
}
// there's already a ParseURL here
// https://github.com/b-camacho/nix/blob/ef6fa54e05cd4134ec41b0d64c1a16db46237f83/src/libutil/url.cc#L13 but that does
// https://github.com/NixOS/nix/blob/ef6fa54e05cd4134ec41b0d64c1a16db46237f83/src/libutil/url.cc#L13 but that does
// not handle git's custom scp-like syntax
GitUrl parseGitUrl(const std::string & url)
{

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

@ -726,7 +726,7 @@ struct GitSourceAccessor : SourceAccessor
try {
_lfsFetch.fetch(blob.get(), pathStr, sink, sizeCallback);
} catch (Error &e) {
e.addTrace({}, "while smudging git-lfs file '%s' (callback interface)", pathStr);
e.addTrace({}, "while reading git-lfs file '%s'", pathStr);
throw;
}
return;

2
tests/nixos/fetch-git/test-cases/lfs/default.nix
View file

@ -51,7 +51,7 @@
# memorize the revision
bad_lfs_rev = client.succeed(f"{repo.git} rev-parse HEAD").strip()
# prove that it can be cloned with regular git first
# test assumption that it can be cloned with regular git first
# (here we see the warning as stated above)
with TemporaryDirectory() as tempdir:
client.succeed(f"git clone -n {repo.remote} {tempdir} >&2")