Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-07 18:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update exports when an exported universal variable changes

Browse source 
Fixes #6612

(cherry picked from commit 7517128b68)
This commit is contained in:
Johannes Altmanninger 2020-02-16 18:51:19 +01:00 committed by David Adam
parent 3882a2ffb3
commit 971a837031
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/env_universal_common.cpp
View file

@ -346,11 +346,12 @@ void env_universal_t::generate_callbacks_and_update_exports(const var_table_t &n
bool old_exports = (existing != this->vars.end() && existing->second.exports()); bool old_exports = (existing != this->vars.end() && existing->second.exports());
bool export_changed = (old_exports != new_entry.exports()); bool export_changed = (old_exports != new_entry.exports());
if (export_changed) { bool value_changed = existing != this->vars.end() && existing->second != new_entry;
if (export_changed || value_changed) {
export_generation += 1; export_generation += 1;
} }
if (existing == this->vars.end() || export_changed || existing->second != new_entry) { if (existing == this->vars.end() || export_changed || value_changed) {
// Value has changed. // Value is set for the first time, or has changed.
callbacks.push_back(callback_data_t(key, new_entry.as_string())); callbacks.push_back(callback_data_t(key, new_entry.as_string()));
} }
} }

7
tests/checks/set.fish
View file

@ -480,4 +480,11 @@ $FISH -c 'set -S EDITOR' | string match -r -e 'global|universal'
# CHECK: $EDITOR: set in universal scope, exported, with 2 elements # CHECK: $EDITOR: set in universal scope, exported, with 2 elements
sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'global|universal' sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'global|universal'
while set -e __fish_test_universal_exported_var
end
set -xU __fish_test_universal_exported_var 1
$FISH -c 'set __fish_test_universal_exported_var 2'
env | string match -e __fish_test_universal_exported_var
#CHECK: __fish_test_universal_exported_var=2
true true