MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-25 22:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-err-fetch' into 'master'

Browse Source 
Fix error on fetch logic

See merge request redox-os/redox!1782
This commit is contained in:
Jeremy Soller 2025-12-21 06:10:25 -07:00
commit e9e6360b23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cook/fetch.rs
View File

@ -229,9 +229,13 @@ pub fn fetch(recipe: &CookRecipe, logger: &PtyOut) -> Result<PathBuf, String> {
get_git_remote_tracking(&source_dir)?;
// TODO: how to get default branch and compare it here?
if remote_name == "origin" && &remote_url == chop_dot_git(git) {
let fetch_rev =
get_git_fetch_rev(&source_dir, &remote_url, &remote_branch)?;
fetch_rev == head_rev
match get_git_fetch_rev(&source_dir, &remote_url, &remote_branch) {
Ok(fetch_rev) => fetch_rev == head_rev,
Err(e) => {
log_to_pty!(logger, "{}", e);
false
}
}
} else {
false
}