v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:tmux/tmux

Browse Source
This commit is contained in:
Nicholas Marriott 2015-07-12 19:47:47 +01:00
commit 28c33f67bc
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README
View File

@ -52,9 +52,10 @@ welcome. Please send by email to:
tmux-users@googlegroups.com tmux-users@googlegroups.com
This file and the CHANGES, FAQ and TODO files are licensed under the ISC This file and the CHANGES, FAQ, SYNCING and TODO files are licensed under
license. Files under examples/ remain copyright their authors unless otherwise the ISC license. Files under examples/ remain copyright their authors unless
stated in the file but permission has been received to distribute them with otherwise stated in the file but permission has been received to distribute
tmux. All other files have a license and copyright notice at their start. them with tmux. All other files have a license and copyright notice at their
start.
-- Nicholas Marriott <nicholas.marriott@gmail.com> -- Nicholas Marriott <nicholas.marriott@gmail.com>

6
cmd-attach-session.c
View File

@ -126,6 +126,12 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
s->cwd = fd; s->cwd = fd;
} }
if (!Eflag) {
update = options_get_string(&s->options,
"update-environment");
environ_update(update, &c->environ, &s->environ);
}
c->session = s; c->session = s;
notify_attached_session_changed(c); notify_attached_session_changed(c);
session_update_activity(s); session_update_activity(s);

2
cmd-switch-client.c
View File

@ -119,7 +119,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
} }
} }
if (c != NULL && s != c->session && !args_has(args, 'E')) { if (c != NULL && !args_has(args, 'E')) {
update = options_get_string(&s->options, "update-environment"); update = options_get_string(&s->options, "update-environment");
environ_update(update, &c->environ, &s->environ); environ_update(update, &c->environ, &s->environ);
} }