extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-11 21:26:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge stack before printing (#9304)

Browse Source 
Could you @fdncred try it?

close?: #9264

---------

Signed-off-by: Maxim Zhiburt <zhiburt@gmail.com>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
This commit is contained in:
Maxim Zhiburt
2023-05-30 03:03:00 +03:00
committed by GitHub
parent cc04b9a916
commit 7f758d3e51
13 changed files with 84 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-cli/src/config_files.rs
View File

@ -100,7 +100,12 @@ pub fn eval_config_contents(
// Merge the environment in case env vars changed in the config
match nu_engine::env::current_dir(engine_state, stack) {
Ok(cwd) => {
if let Err(e) = engine_state.merge_env(stack, cwd) {
if let Err(e) = engine_state.merge_env(stack) {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &e);
}
if let Err(e) = engine_state.set_current_working_dir(cwd) {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &e);
}