Skip to content

Fix extracting lfs.url from git config #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmpify merged 3 commits into from
Mar 24, 2026
Merged

Fix extracting lfs.url from git config #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9210f7
Fix using lfs.url config
gmpify Mar 23, 2026
f70ca9f
Strip /info/lfs from lfs.url
gmpify Mar 23, 2026
0a4f3ec
Fix LFS api endpoint discovery behavior to more closely match git-lfs
lilyinstarlight Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/libfetchers/git-lfs-fetch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ struct LfsApiInfo

} // namespace

static std::string lfsEndpointUrl(const ParsedURL & url)
{
auto endpoint = url.to_string();
if (!endpoint.ends_with(".git"))
endpoint += ".git";
return endpoint + "/info/lfs";
}

static LfsApiInfo getLfsApi(const ParsedURL & url)
{
assert(url.authority.has_value());
Expand Down Expand Up @@ -95,7 +87,12 @@ static LfsApiInfo getLfsApi(const ParsedURL & url)
if (authIt == headerIt->end())
throw Error("no Authorization in git-lfs-authenticate response");

return {queryResp.at("href").get<std::string>(), authIt->get<std::string>()};
auto href = url.to_string();
auto hrefIt = queryResp.find("href");
if (hrefIt != queryResp.end())
href = hrefIt->get<std::string>();

return {href, authIt->get<std::string>()};
}
else {
std::ostringstream inputCredDescr;
Expand Down Expand Up @@ -125,10 +122,10 @@ static LfsApiInfo getLfsApi(const ParsedURL & url)
if (username.empty() || password.empty())
throw Error("git-credential-fill: no credentials returned (cmd: 'git credential fill' for protocol=%s, host=%s, path=%s)", url.scheme, url.authority->host, url.renderPath(true));

return {lfsEndpointUrl(url), "Basic " + base64::encode(std::as_bytes(std::span<const char>{username + ":" + password}))};
return {url.to_string(), "Basic " + base64::encode(std::as_bytes(std::span<const char>{username + ":" + password}))};
}

return {lfsEndpointUrl(url), std::nullopt};
return {url.to_string(), std::nullopt};
}

typedef std::unique_ptr<git_config, Deleter<git_config_free>> GitConfig;
Expand All @@ -137,7 +134,7 @@ typedef std::unique_ptr<git_config_entry, Deleter<git_config_entry_free>> GitCon
static std::string getLfsEndpointUrl(git_repository * repo)
{
GitConfig config;
if (git_repository_config(Setter(config), repo)) {
if (!git_repository_config(Setter(config), repo)) {
GitConfigEntry entry;
if (!git_config_get_entry(Setter(entry), config.get(), "lfs.url")) {
auto value = std::string(entry->value);
Expand All @@ -149,14 +146,18 @@ static std::string getLfsEndpointUrl(git_repository * repo)
}

git_remote * remote = nullptr;
if (git_remote_lookup(&remote, repo, "origin"))
return "";

const char * url_c_str = git_remote_url(remote);
if (!url_c_str)
return "";
if (!git_remote_lookup(&remote, repo, "origin")) {
const char * url_c_str = git_remote_url(remote);
if (url_c_str) {
auto remote = std::string(url_c_str);
if (remote.ends_with(".git"))
return remote + "/info/lfs";
else
return remote + ".git/info/lfs";
}
}

return std::string(url_c_str);
return "";
}

static std::optional<Pointer> parseLfsPointer(std::string_view content, std::string_view filename)
Expand Down
Loading