From 6b53682f1f59b1591b6c76f8dad1ce9c32e697f9 Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 8 Aug 2011 10:18:58 +1000
Subject: [PATCH 1/2] To make sure that /Users/andrew/.oh-my-zsh is set
 correcrly when launching the check_for_upgrade script, pass the value in to
 env.

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c4522491b..f77762815 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,7 +1,7 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh

From 42b5a1ddcd8bde26ea79e778ea81e03d1566cc0f Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 30 Jan 2012 11:11:11 +1000
Subject: [PATCH 2/2] Include any Hosts that have been added to .ssh/config to
 the list of completion options.

---
 lib/completion.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b964595ed..43f5a224e 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -35,10 +35,12 @@ cdpath=(.)
 [ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
+[ -r ~/.ssh/config ] &&      _ssh_config_hosts=(${(s: :)${(ps:\t:)${(f)"$(<$HOME/.ssh/config|grep 'Host')"}#Host}#Hostname}) || _ssh_config_hosts=()
 hosts=(
   "$_global_ssh_hosts[@]"
   "$_ssh_hosts[@]"
   "$_etc_hosts[@]"
+  "$_ssh_config_hosts[@]"
   "$HOST"
   localhost
 )