Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge candidates #173

Closed
wants to merge 3 commits into from
Closed

Merge candidates #173

wants to merge 3 commits into from

Conversation

flz
Copy link
Contributor

@flz flz commented Dec 29, 2010

Here are two commits:

  • one to support LS_COLORS automatically in zsh completion,
  • the other to add vcs_info_prompt(), a more generic version of git_prompt_info().

flz added 3 commits December 29, 2010 13:28
lib/git.zsh isn't generic enough for me, and zsh provides vcs_info
so we may as well use it.
Zsh can use LS_COLORS for completion, use it by default.
Create symlink for screen/tmux when doing agent forwarding. This
means agent forwarding keeps working after ssh deconnections.

Screen will need the following added to .screenrc:

setenv SSH_AUTH_SOCK "/tmp/ssh-agent-$USER-screen"
@robbyrussell
Copy link
Member

Hi there,

Would it be possible to have the LS_COLORS feature respect the following variable that can be set in .zshrc?

DISABLE_LS_COLORS

Thanks in advance!

Cheers,
Robby

@gwjo
Copy link
Contributor

gwjo commented Jun 2, 2011

There needs to be some other check to ensure you want to do agent forwarding, before creating the symlink; otherwise you'll fail to spawn the ssh-agent if it died without cleaning up completely and left behind the socket

@flz
Copy link
Contributor Author

flz commented Jun 2, 2011

Another check? If SSH_AUTH_SOCK is set it means that the user either used ForwardAgent in .ssh/config or used ssh -A. Either way we explicitly ask for agent forwarding.

@gwjo
Copy link
Contributor

gwjo commented Jun 2, 2011

It's also set when you run the ssh-agent locally, rather than through forwarding.

Checking that SSH_AGENT_PID not being set when SSH_AUTH_SOCK is set would be sufficient to say that client forwarding is enabled.

@gwjo
Copy link
Contributor

gwjo commented Jun 5, 2011

I've taken the liberty of including this idea, with the added ability to turn it on/off into pull request #404. By default we have backwards compatibility but you can turn this functionality on by using a zstyle setting.

@robbyrussell
Copy link
Member

Closing as this was handled in #404

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants