From 9d1dd24e3568ebbcce093bb351ea776a0bf2c0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 19 Jan 2019 18:00:04 +0100
Subject: [PATCH 1/4] ssh-agent: add default keys if no zstyle identities were
 set (#7520)

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 1cc5630e1..0a204309e 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -21,6 +21,16 @@ function _add_identities() {
 		return
 	fi
 
+	# add default keys if no identities were set up via zstyle
+	# this is to mimic the call to ssh-add with no identities
+	if [[ ${#identities} -eq 0 ]]; then
+		# key list found on `ssh-add` man page's DESCRIPTION section
+		for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
+			# check if file exists
+			[[ -f "$HOME/.ssh/$id" ]] && identities+=$id
+		done
+	fi
+
 	# get list of loaded identities' signatures
 	for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
 
@@ -36,7 +46,7 @@ function _add_identities() {
 		[[ ${loaded[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
 	done
 
-	if [[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
+	[[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from

From 6db298c57a5a8901cc280f00ec38fffb527ac86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 20 Jan 2019 17:20:26 +0100
Subject: [PATCH 2/4] misc: remove please alias to sudo

Fixes #7527
---
 lib/misc.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index f45c10757..b30822b50 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -23,7 +23,6 @@ env_default 'LESS' '-R'
 
 ## super user alias
 alias _='sudo'
-alias please='sudo'
 
 ## more intelligent acking for ubuntu users
 if which ack-grep &> /dev/null; then

From 3c16466a14516eb3c177e7eb0553adbe16f39890 Mon Sep 17 00:00:00 2001
From: neeasade <neeasade@users.noreply.github.com>
Date: Sun, 20 Jan 2019 13:19:07 -0600
Subject: [PATCH 3/4] git: quote branch name in ggpull and ggpush (#7472)

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 45a706173..2251bae2e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -155,10 +155,10 @@ compdef _git ggu=git-checkout
 alias ggpur='ggu'
 compdef _git ggpur=git-checkout
 
-alias ggpull='git pull origin $(git_current_branch)'
+alias ggpull='git pull origin "$(git_current_branch)"'
 compdef _git ggpull=git-checkout
 
-alias ggpush='git push origin $(git_current_branch)'
+alias ggpush='git push origin "$(git_current_branch)"'
 compdef _git ggpush=git-checkout
 
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'

From b9670d04092a461ae1db41080263b5a82bc1f958 Mon Sep 17 00:00:00 2001
From: Rehan Mahmood <csharpking@yahoo.com>
Date: Sun, 20 Jan 2019 14:31:23 -0500
Subject: [PATCH 4/4] template: change plugins definition to single line
 (#7498)

---
 templates/zshrc.zsh-template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7cd2a873b..abd2c8812 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -62,9 +62,7 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(
-  git
-)
+plugins=(git)
 
 source $ZSH/oh-my-zsh.sh