lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge pull request #6290 from Misterio77/fix-sourcehut-tags-refs

Browse source 
Fix sourcehut tags refs resolving
This commit is contained in:
Eelco Dolstra 2022-03-21 11:23:56 +01:00 committed by GitHub
parent 8ad485ea89 31544b93ff
commit 7ed81701ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libfetchers/github.cc
View file

@ -390,7 +390,7 @@ struct SourceHutInputScheme : GitArchiveInputScheme
ref_uri = line.substr(ref_index+5, line.length()-1); ref_uri = line.substr(ref_index+5, line.length()-1);
} else } else
ref_uri = fmt("refs/heads/%s", ref); ref_uri = fmt("refs/(heads|tags)/%s", ref);
auto file = store->toRealPath( auto file = store->toRealPath(
downloadFile(store, fmt("%s/info/refs", base_url), "source", false, headers).storePath); downloadFile(store, fmt("%s/info/refs", base_url), "source", false, headers).storePath);
@ -399,9 +399,11 @@ struct SourceHutInputScheme : GitArchiveInputScheme
std::string line; std::string line;
std::string id; std::string id;
while(getline(is, line)) { while(getline(is, line)) {
auto index = line.find(ref_uri); // Append $ to avoid partial name matches
if (index != std::string::npos) { std::regex pattern(fmt("%s$", ref_uri));
id = line.substr(0, index-1);
if (std::regex_search(line, pattern)) {
id = line.substr(0, line.find('\t'));
break; break;
} }
} }

2
tests/sourcehut-flakes.nix
View file

@ -59,7 +59,7 @@ let
echo 'ref: refs/heads/master' > $out/HEAD echo 'ref: refs/heads/master' > $out/HEAD
mkdir -p $out/info mkdir -p $out/info
echo '${nixpkgs.rev} refs/heads/master' > $out/info/refs echo -e '${nixpkgs.rev}\trefs/heads/master' > $out/info/refs
''; '';
in in