extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-29 01:59:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-07-06 16:01:10 +01:00
commit 9a0ce98c54
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
}
if (!Eflag) {
update = options_get_string(&s->options,
"update-environment");
environ_update(update, &c->environ, &s->environ);
}
c->session = s;
notify_attached_session_changed(c);
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");
environ_update(update, &c->environ, &s->environ);
}