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

Merge branch 'git-invalidate-branch' into 'master'

Browse Source 
Invalidate git fetch when branch name different

See merge request redox-os/redox!1792
This commit is contained in:
Jeremy Soller 2025-12-29 09:41:25 -07:00
commit 54c1bcec43
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cook/fetch.rs
View File

@ -228,7 +228,15 @@ pub fn fetch(recipe: &CookRecipe, logger: &PtyOut) -> Result<PathBuf, String> {
let (_, remote_branch, remote_name, remote_url) =
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) {
if let Some(branch) = branch
&& branch != &remote_branch
{
false
} else if remote_name != "origin" {
false
} else if &remote_url != chop_dot_git(git) {
false
} else {
match get_git_fetch_rev(&source_dir, &remote_url, &remote_branch) {
Ok(fetch_rev) => fetch_rev == head_rev,
Err(e) => {
@ -236,8 +244,6 @@ pub fn fetch(recipe: &CookRecipe, logger: &PtyOut) -> Result<PathBuf, String> {
false
}
}
} else {
false
}
}
};