Commit e2838f75 authored by Robby Russell's avatar Robby Russell
Browse files

Merge pull request #2396 from soluwalana/master

Fix WIP false positive
parents a38af279 d60522c7
...@@ -142,13 +142,13 @@ compdef _git glp=git-log ...@@ -142,13 +142,13 @@ compdef _git glp=git-log
# #
# This function return a warning if the current branch is a wip # This function return a warning if the current branch is a wip
function work_in_progress() { 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!!" echo "WIP!!"
fi fi
} }
# these alias commit and uncomit wip branches # 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 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 # these alias ignore changes to file
alias gignore='git update-index --assume-unchanged' alias gignore='git update-index --assume-unchanged'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment