Skip to content

Commit c137418

Browse files
committed
Explicitly disable git gpg signing
Otherwise building fails if the user has globally enabled gpg signing. Fixes rust-lang#1384
1 parent 34d63e4 commit c137418

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

build_system/utils.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ pub(crate) fn git_command<'a>(repo_dir: impl Into<Option<&'a Path>>, cmd: &str)
168168
169169
.arg("-c")
170170
.arg("core.autocrlf=false")
171+
.arg("-c")
172+
.arg("commit.gpgSign=false")
171173
.arg(cmd);
172174
if let Some(repo_dir) = repo_dir.into() {
173175
git_cmd.current_dir(repo_dir);

scripts/setup_rust_fork.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ git fetch
1010
git checkout -- .
1111
git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
1212

13-
git -c user.name=Dummy -c [email protected] am ../patches/*-stdlib-*.patch
13+
git -c user.name=Dummy -c [email protected] -c commit.gpgSign=false \
14+
am ../patches/*-stdlib-*.patch
1415

1516
git apply - <<EOF
1617
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml

0 commit comments

Comments
 (0)