1 files changed, 37 insertions, 10 deletions
diff --git a/plugins/git-commit/git-commit.plugin.zsh b/plugins/git-commit/git-commit.plugin.zsh
index 72cecb1d6..c4df77c80 100644
--- a/plugins/git-commit/git-commit.plugin.zsh
+++ b/plugins/git-commit/git-commit.plugin.zsh
@@ -1,3 +1,9 @@
+local _rev="$(git -C $ZSH rev-parse HEAD 2> /dev/null)"
+if [[ $_rev == $(git config --global --get oh-my-zsh.git-commit-alias 2> /dev/null) ]]; then
+  return
+fi
+git config --global oh-my-zsh.git-commit-alias "$_rev"
+
 local -a _git_commit_aliases
 _git_commit_aliases=(
   'build'
@@ -11,21 +17,42 @@ _git_commit_aliases=(
   'revert'
   'style'
   'test'
+  'wip'
 )
 
-local alias type
-for type in "${_git_commit_aliases[@]}"; do
+local _alias _type
+for _type in "${_git_commit_aliases[@]}"; do
   # an alias can't be named "revert" because the git command takes precedence
   # https://stackoverflow.com/a/3538791
-  case "$type" in
-  revert) alias=rev ;;
-  *) alias=$type ;;
+  case "$_type" in
+    revert) _alias=rev ;;
+    *) _alias=$_type ;;
   esac
 
-  local func='!a() { if [ "$1" = "-s" ] || [ "$1" = "--scope" ]; then local scope="$2"; shift 2; git commit -m "'$type'(${scope}): ${@}"; else git commit -m "'$type': ${@}"; fi }; a'
-  if ! git config --global --get-all alias.${alias} >/dev/null 2>&1; then
-    git config --global alias.${alias} "$func"
-  fi
+  local _func='!a() {
+local _scope _attention _message
+while [ $# -ne 0 ]; do
+case $1 in
+  -s | --scope )
+    if [ -z $2 ]; then
+      echo "Missing scope!"
+      return 1
+    fi
+    _scope="$2"
+    shift 2
+    ;;
+  -a | --attention )
+    _attention="!"
+    shift 1
+    ;;
+  * )
+    _message="${_message} $1"
+    shift 1
+    ;;
+esac
 done
+git commit -m "'$_type'${_scope:+(${_scope})}${_attention}:${_message}"
+}; a'
 
-unset _git_commit_aliases alias type func
+  git config --global alias.$_alias "$_func"
+done