h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-23 16:51:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

don't import bash history if not default fish hist

Browse Source 
Don't import the bash history if the user has specified that a non-default
fish history file should be used. Also, rename the var that specifies
the fish history session ID from `FISH_HISTFILE` to `FISH_HISTORY`.

Fixes #4172
This commit is contained in:
Kurtis Rader
2017-06-30 20:24:55 -07:00
parent 2cc0107dbf
commit ec14527545
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/env.cpp
View File

@@ -614,7 +614,7 @@ static void react_to_variable_change(const wcstring &key) {
invalidate_termsize(true); // force fish to update its idea of the terminal size plus vars
} else if (key == L"FISH_READ_BYTE_LIMIT") {
env_set_read_limit();
} else if (key == L"FISH_HISTFILE") {
} else if (key == L"FISH_HISTORY") {
history_destroy();
reader_push(history_session_id().c_str());
}