From 140b34b7ed1806087cd8cdbe648314b4a1f87c7a Mon Sep 17 00:00:00 2001 From: Leandro Emmanuel Reina Kiperman Date: Mon, 9 Dec 2024 19:02:50 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Robert Hensing --- src/libfetchers/git-lfs-fetch.hh | 2 +- src/libfetchers/git-utils.cc | 2 +- tests/nixos/fetch-git/test-cases/lfs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libfetchers/git-lfs-fetch.hh b/src/libfetchers/git-lfs-fetch.hh index 7c1b9fd0e..8f63f4af4 100644 --- a/src/libfetchers/git-lfs-fetch.hh +++ b/src/libfetchers/git-lfs-fetch.hh @@ -313,7 +313,7 @@ std::optional 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) { diff --git a/src/libfetchers/git-utils.cc b/src/libfetchers/git-utils.cc index 8a4a544ce..80da391de 100644 --- a/src/libfetchers/git-utils.cc +++ b/src/libfetchers/git-utils.cc @@ -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; diff --git a/tests/nixos/fetch-git/test-cases/lfs/default.nix b/tests/nixos/fetch-git/test-cases/lfs/default.nix index 22b07280b..2a176264f 100644 --- a/tests/nixos/fetch-git/test-cases/lfs/default.nix +++ b/tests/nixos/fetch-git/test-cases/lfs/default.nix @@ -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")