I have noticed that `autostash` called an (accidentally)
defined/overwritten `stash` function.
While it's not possible to put this into a local scope, this will at
least make it less polluting by default (when autostashing is not used).
Additionally we could source it always (not just once), but then it
would only re-overwrite the function.
A better fix would be to prefix the functions explicitly, e.g.
`autoenv_autostash` etc.
Closes https://github.com/Tarrasch/zsh-autoenv/pull/42.
local autoenv_to_dir=$PWD
# Source varstash library once.
local autoenv_to_dir=$PWD
# Source varstash library once.
+ # XXX: pollutes environment with e.g. `stash`, and `autostash` will cause
+ # an overwritten `stash` function to be called!
if [[ -z "$functions[(I)autostash]" ]]; then
if [[ -z "$functions[(I)autostash]" ]]; then
- source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
+ if \grep -qE '\b(autostash|autounstash|stash)\b' $autoenv_env_file; then
+ source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
+ fi
# NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
# ${autoenv_env_file:h}.
fi
# NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
# ${autoenv_env_file:h}.
fi
fi
# Unstash any autostashed stuff.
fi
# Unstash any autostashed stuff.
- varstash_dir=$prev_dir autounstash
+ if [[ -n "$functions[(I)autostash]" ]]; then
+ varstash_dir=$prev_dir autounstash
+ fi
_autoenv_stack_entered_remove $prev_file
fi
_autoenv_stack_entered_remove $prev_file
fi
- $ echo 'echo ENTER; autostash FOO=changed' > $AUTOENV_FILE_ENTER
- $ echo 'echo LEAVE; autounstash' > $AUTOENV_FILE_LEAVE
-Manually create auth file
+The varstash library should not get loaded always.
+ $ echo 'echo ENTER' > $AUTOENV_FILE_ENTER
+ $ echo 'echo LEAVE' > $AUTOENV_FILE_LEAVE
+ $ test_autoenv_auth_env_files
+ $ cd .
+ ENTER
+ $ type -w autostash
+ autostash: none
+ [1]
+
+Now on to some stashing.
+
+ $ echo 'echo ENTER; autostash FOO=changed' > $AUTOENV_FILE_ENTER
+ $ echo 'echo LEAVE; autounstash' > $AUTOENV_FILE_LEAVE
$ test_autoenv_auth_env_files
Set environment variable.
$ test_autoenv_auth_env_files
Set environment variable.
Activating the env stashes it and applies a new value.
Activating the env stashes it and applies a new value.
+ $ cd ..
+ LEAVE
+ $ cd sub
+ $ type -w autostash
+ autostash: function