diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-08-20 11:50:05 -0700 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-08-20 19:58:07 -0700 |
| commit | cdea15407efbf98261020ce35eec17c4dd49c623 (patch) | |
| tree | 405b9d9cd5ac54c0e1306d5b49fb1d958c00ade1 /src/config.rs | |
| parent | 3722146a25af54edd20c56c45aab6ac415ec75eb (diff) | |
Hold GitConfig in main Config struct
Diffstat (limited to 'src/config.rs')
| -rw-r--r-- | src/config.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs index 1972fa47..b0a8cb3c 100644 --- a/src/config.rs +++ b/src/config.rs @@ -15,7 +15,7 @@ use crate::delta::State; use crate::env; use crate::features::navigate; use crate::features::side_by_side; -use crate::git_config::GitConfigEntry; +use crate::git_config::{GitConfig, GitConfigEntry}; use crate::style::{self, Style}; pub struct Config { @@ -35,6 +35,7 @@ pub struct Config { pub file_renamed_label: String, pub hunk_label: String, pub file_style: Style, + pub git_config: Option<GitConfig>, pub git_config_entries: HashMap<String, GitConfigEntry>, pub hunk_header_file_style: Style, pub hunk_header_line_number_style: Style, @@ -213,6 +214,7 @@ impl From<cli::Opt> for Config { file_renamed_label, hunk_label, file_style, + git_config: opt.git_config, git_config_entries: opt.git_config_entries, hunk_header_file_style, hunk_header_line_number_style, |