diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2025-03-30 15:43:48 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2025-03-30 15:43:48 +0000 |
| commit | 1111a9788650b6cde6f78250a81328f6ab211b51 (patch) | |
| tree | 8da5f804e24c7309bca11e50855c5a7d1c9c3926 /compiler/rustc_codegen_cranelift/scripts/rustup.sh | |
| parent | 45b40a75966b36d3588f173441896fddad01cd80 (diff) | |
| parent | ba315abda789c9f59f2100102232bddb30b0d3d3 (diff) | |
| download | rust-1111a9788650b6cde6f78250a81328f6ab211b51.tar.gz rust-1111a9788650b6cde6f78250a81328f6ab211b51.zip | |
Merge commit 'ba315abda789c9f59f2100102232bddb30b0d3d3' into sync_cg_clif-2025-03-30
Diffstat (limited to 'compiler/rustc_codegen_cranelift/scripts/rustup.sh')
| -rwxr-xr-x | compiler/rustc_codegen_cranelift/scripts/rustup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/scripts/rustup.sh b/compiler/rustc_codegen_cranelift/scripts/rustup.sh index 355282911c2..152c243aa6a 100755 --- a/compiler/rustc_codegen_cranelift/scripts/rustup.sh +++ b/compiler/rustc_codegen_cranelift/scripts/rustup.sh @@ -64,7 +64,7 @@ case $1 in cg_clif=$(pwd) pushd ../rust git fetch origin master - git checkout "$RUST_VERS" + git -c advice.detachedHead=false checkout "$RUST_VERS" "$cg_clif/git-fixed-subtree.sh" push --prefix=compiler/rustc_codegen_cranelift/ "$cg_clif" sync_from_rust popd git merge sync_from_rust -m "Sync from rust $RUST_VERS" |