github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-02 08:16:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mark env_var_node as changing exports if it unexports an exported var

Browse Source 
Fixes #2611 (hopefully).
This commit is contained in:
Fabian Homborg 2017-06-21 16:48:48 +02:00 committed by Kurtis Rader
parent 415c7ebbcc
commit 473dc16b2b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/env.cpp
View File

@ -118,7 +118,8 @@ class env_node_t {
/// in the stack are invisible. If new_scope is set for the global variable node, the universe
/// will explode.
bool new_scope;
/// Does this node contain any variables which are exported to subshells.
/// Does this node contain any variables which are exported to subshells
/// or does it redefine any variables to not be exported?
bool exportv = false;
/// Pointer to next level.
std::unique_ptr<env_node_t> next;
@ -1109,6 +1110,9 @@ int env_set(const wcstring &key, const wchar_t *val, env_mode_flags_t var_mode)
has_changed_new = true;
} else {
entry.exportv = false;
// Set the node's exportv when it changes something about exports
// (also when it redefines a variable to not be exported).
node->exportv = has_changed_old != has_changed_new;
}
if (has_changed_old || has_changed_new) vars_stack().mark_changed_exported();