diff options
| author | onur-ozkan <work@onurozkan.dev> | 2024-09-09 20:17:34 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2024-09-09 20:17:34 +0300 |
| commit | 05043a370a77f8647b5fa609488dbdfebb71d1a4 (patch) | |
| tree | b8737f5eb59b851254936bb6a6fcafe0805bd79a | |
| parent | 38e3a5771cefc9362976a605549f8b04d5707311 (diff) | |
| download | rust-05043a370a77f8647b5fa609488dbdfebb71d1a4.tar.gz rust-05043a370a77f8647b5fa609488dbdfebb71d1a4.zip | |
add `git_merge_commit_email` into `GitConfig`
Signed-off-by: onur-ozkan <work@onurozkan.dev>
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 1 | ||||
| -rw-r--r-- | src/tools/build_helper/src/git.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 68b42305fdc..646e76d46b6 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -2509,6 +2509,7 @@ impl Config { GitConfig { git_repository: &self.stage0_metadata.config.git_repository, nightly_branch: &self.stage0_metadata.config.nightly_branch, + git_merge_commit_email: &self.stage0_metadata.config.git_merge_commit_email, } } diff --git a/src/tools/build_helper/src/git.rs b/src/tools/build_helper/src/git.rs index cc48a8964a3..98e5b7a328e 100644 --- a/src/tools/build_helper/src/git.rs +++ b/src/tools/build_helper/src/git.rs @@ -4,6 +4,7 @@ use std::process::{Command, Stdio}; pub struct GitConfig<'a> { pub git_repository: &'a str, pub nightly_branch: &'a str, + pub git_merge_commit_email: &'a str, } /// Runs a command and returns the output |