Skip to content

Commit

Permalink
Fix stealth merge conflict
Browse files Browse the repository at this point in the history
Between:
* microsoft#1210
* microsoft#1408

This adds the URL to normal registries use of this but doesn't repeat the URL over and over again in ci-verify-versions.
  • Loading branch information
BillyONeal committed Jun 26, 2024
1 parent f80ef48 commit f632e79
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
9 changes: 8 additions & 1 deletion src/vcpkg/registries.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,14 @@ namespace

const auto& git_tree = port_versions_soa.git_trees()[it - port_versions.begin()];
return m_paths.versions_dot_git_dir()
.then([&, this](Path&& dot_git) { return m_paths.git_checkout_port(port_name, git_tree, dot_git); })
.then([&, this](Path&& dot_git) {
return m_paths.git_checkout_port(port_name, git_tree, dot_git).map_error([](LocalizedString&& err) {
return std::move(err)
.append_raw('\n')
.append_raw(NotePrefix)
.append(msgSeeURL, msg::url = docs::troubleshoot_versioning_url);
});
})
.map([&git_tree](Path&& p) -> PortLocation {
return {
std::move(p),
Expand Down
1 change: 0 additions & 1 deletion src/vcpkg/vcpkgpaths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,6 @@ namespace vcpkg
}

error.append_raw('\n').append(std::move(maybe_git_read_tree_output).error());
error.append(msgSeeURL, msg::url = docs::troubleshoot_versioning_url);
return error;
}

Expand Down

0 comments on commit f632e79

Please sign in to comment.