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

Update to origin when fetching

Browse Source
This commit is contained in:
Jeremy Soller 2020-08-27 10:20:04 -06:00
parent bafe721a59
commit 48b786e6d8
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/cook.rs
View File

@ -209,16 +209,23 @@ fn fetch(recipe_dir: &Path, source: &SourceRecipe) -> Result<PathBuf, String> {
run_command(command)?;
} else {
//TODO: complicated stuff to check and reset branch to origin
// ORIGIN_BRANCH="$(git branch --remotes | grep '^ origin/HEAD -> ' | cut -d ' ' -f 5-)"
// if [ -n "$BRANCH" ]
// then
// ORIGIN_BRANCH="origin/$BRANCH"
// fi
//
// if [ "$(git rev-parse HEAD)" != "$(git rev-parse $ORIGIN_BRANCH)" ]
// then
// git checkout -B "$(echo "$ORIGIN_BRANCH" | cut -d / -f 2-)" "$ORIGIN_BRANCH"
// fi
let mut command = Command::new("bash");
command.arg("-c").arg(r#"
ORIGIN_BRANCH="$(git branch --remotes | grep '^ origin/HEAD -> ' | cut -d ' ' -f 5-)"
if [ -n "$BRANCH" ]
then
ORIGIN_BRANCH="origin/$BRANCH"
fi
if [ "$(git rev-parse HEAD)" != "$(git rev-parse $ORIGIN_BRANCH)" ]
then
git checkout -B "$(echo "$ORIGIN_BRANCH" | cut -d / -f 2-)" "$ORIGIN_BRANCH"
fi"#);
if let Some(branch) = branch {
command.env("BRANCH", branch);
}
command.current_dir(&source_dir);
run_command(command)?;
}
// Sync submodules URL