mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 23:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix minor bug in UserSettings

Browse source 
The timestamp couldn't be set with `--config-toml 'user.timestamp=...'`.
This commit is contained in:
Ilya Grigoriev 2023-01-01 15:45:29 -08:00
parent 6d8d495075
commit 95637e252c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/settings.rs
View file

@ -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,
})
}