From 827d9dfcb406c5d25470010933fc6fde85a7ded7 Mon Sep 17 00:00:00 2001 From: Sam O Date: Thu, 2 Jan 2014 15:48:09 -0800 Subject: [PATCH 1/2] Update git.plugin.zsh --- plugins/git/git.plugin.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index fde22a37d..42b4698f9 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -142,13 +142,13 @@ compdef _git glp=git-log # # This function return a warning if the current branch is a wip function work_in_progress() { - if $(git log -n 1 2>/dev/null | grep -q -c wip); then + if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then echo "WIP!!" fi } # these alias commit and uncomit wip branches -alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"' -alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1' +alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"' +alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1' # these alias ignore changes to file alias gignore='git update-index --assume-unchanged' From d60522c7a290565c9de7594817a9d201732d5dd9 Mon Sep 17 00:00:00 2001 From: Sam O Date: Thu, 2 Jan 2014 15:53:34 -0800 Subject: [PATCH 2/2] escape dashes --- 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 42b4698f9..1285a3247 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -142,13 +142,13 @@ compdef _git glp=git-log # # This function return a warning if the current branch is a wip function work_in_progress() { - if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then + if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then echo "WIP!!" fi } # these alias commit and uncomit wip branches alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"' -alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1' +alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1' # these alias ignore changes to file alias gignore='git update-index --assume-unchanged'