diff options
| author | Robby Russell <robby@planetargon.com> | 2014-01-02 16:01:28 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-01-02 16:01:28 -0800 |
| commit | e2838f75f0be001cf34da321c9c712d48699e518 (patch) | |
| tree | acf8ac162c86220410192a2b0909bcf690a2485b | |
| parent | a38af27991d15d14ac4ca55c919bb694d7eafb7a (diff) | |
| parent | d60522c7a290565c9de7594817a9d201732d5dd9 (diff) | |
| download | zsh-e2838f75f0be001cf34da321c9c712d48699e518.tar.gz zsh-e2838f75f0be001cf34da321c9c712d48699e518.tar.bz2 zsh-e2838f75f0be001cf34da321c9c712d48699e518.zip | |
Merge pull request #2396 from soluwalana/master
Fix WIP false positive
| -rw-r--r-- | plugins/git/git.plugin.zsh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index fde22a37d..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 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' |