mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-19 19:08:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

completion: remove redundant rebuild of default config

Browse source
This commit is contained in:
Yuya Nishihara 2024-11-28 16:52:22 +09:00
parent c4eaef6dfc
commit d6efd12bc8
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/complete.rs
View file

@ -676,11 +676,7 @@ fn get_jj_command() -> Result<(JjBuilder, UserSettings), CommandError> {
// child process. This shouldn't fail, since none of the global args are // child process. This shouldn't fail, since none of the global args are
// required. // required.
let app = crate::commands::default_app(); let app = crate::commands::default_app();
let config = config::Config::builder() let mut stacked_config = config_from_environment(default_config());
.add_source(default_config())
.build()
.expect("default config should be valid");
let mut stacked_config = config_from_environment(config);
let ui = Ui::with_config(&stacked_config.merge()).expect("default config should be valid"); let ui = Ui::with_config(&stacked_config.merge()).expect("default config should be valid");
let cwd = std::env::current_dir() let cwd = std::env::current_dir()
.and_then(|cwd| cwd.canonicalize()) .and_then(|cwd| cwd.canonicalize())