MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'git-fix' into 'master'

Browse Source 
Fix git source kept reupdating for using non default branch

See merge request redox-os/redox!2334
This commit is contained in:
Jeremy Soller 2026-09-09 06:24:57 -06:00
commit 0ecd42af89
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cook/fetch.rs
View File

@ -273,7 +273,7 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
match get_git_fetch_rev(
&source_dir,
&remote.remote_url,
&remote.remote_branch,
branch.as_ref().unwrap_or(&remote.remote_branch),
) {
Ok(fetch_rev) => fetch_rev == head_rev,
Err(e) => {
@ -322,6 +322,7 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
} else {
let branch = match branch {
Some(branch) => branch.clone(),
// TODO: Reuse default branch name from get_git_remote_tracking?
None => get_git_remote_branch(&source_dir, "origin")?,
};
let mut command = Command::new("git");