mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 23:47:22 +00:00
Fix minor bug in UserSettings
The timestamp couldn't be set with `--config-toml 'user.timestamp=...'`.
This commit is contained in:
parent
6d8d495075
commit
95637e252c
1 changed files with 4 additions and 2 deletions
|
@ -54,9 +54,11 @@ impl UserSettings {
|
|||
config_builder =
|
||||
config_builder.add_source(config::File::from_str(s, config::FileFormat::Toml));
|
||||
}
|
||||
let new_config = config_builder.build()?;
|
||||
let timestamp = get_timestamp_config(&new_config, "user.timestamp");
|
||||
Ok(UserSettings {
|
||||
config: config_builder.build()?,
|
||||
timestamp: self.timestamp.clone(),
|
||||
config: new_config,
|
||||
timestamp,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue