From ed6645a2823dc6c3e0fae822186d79542682e68e Mon Sep 17 00:00:00 2001
From: Arnaud Rinquin <rinquin.arnaud@gmail.com>
Date: Wed, 17 Jun 2015 13:25:09 +0100
Subject: [PATCH 1/2] Fix plugin/git ggpull and ggpush backward compatibility
Current `ggpush` is `git push origin` instead of `git push origin $(current_branch)`
Same for `ggpull`
---
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 d59e0ca9f..168618760 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -105,7 +105,7 @@ ggl() {
git pull origin "${b:=$1}" "${*[2,-1]}"
}
compdef _git ggl=git-checkout
-alias ggpull='ggl'
+alias ggpull='git pull origin $(current_branch)'
compdef _git ggpull=git-checkout
ggp() {
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
@@ -116,7 +116,7 @@ git push origin "${b:=$1}"
fi
}
compdef _git ggp=git-checkout
-alias ggpush='ggp'
+alias ggpush='git push origin $(current_branch)'
compdef _git ggpush=git-checkout
ggpnp() {
if [[ "$#" == 0 ]]; then
From d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 17 Jun 2015 22:38:31 +0200
Subject: [PATCH 2/2] git plugin: fix ggl to avoid empty string see
https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330
---
plugins/git/git.plugin.zsh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 168618760..cc6eb1031 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -101,8 +101,12 @@ git push --force origin "${b:=$1}"
}
compdef _git ggf=git-checkout
ggl() {
+if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
+git pull origin "${*}"
+else
[[ "$#" == 0 ]] && local b="$(current_branch)"
-git pull origin "${b:=$1}" "${*[2,-1]}"
+git pull origin "${b:=$1}"
+fi
}
compdef _git ggl=git-checkout
alias ggpull='git pull origin $(current_branch)'