zsh completion for git?

.gitignore

@@ -22,3 +22,5 @@
 !.oh-my-zsh/**
 !.custom
 !.custom/**
+!.zsh
+!.zsh/**

.kube/config

@@ -6,7 +6,7 @@ clusters:
   name: gke_flowfactor_europe-west1-b_ff-stage-euw1-cluster-primary
 - cluster:
     certificate-authority: /Users/beppe/.minikube/ca.crt
-    server: https://192.168.64.7:8443
+    server: https://192.168.64.12:8443
   name: minikube
 contexts:
 - context:
@@ -17,7 +17,7 @@ contexts:
     cluster: minikube
     user: minikube
   name: minikube
-current-context: minikube
+current-context: gke_flowfactor_europe-west1-b_ff-stage-euw1-cluster-primary
 kind: Config
 preferences: {}
 users:
@@ -25,10 +25,10 @@ users:
   user:
     auth-provider:
       config:
-        access-token: ya29.a0Adw1xeXFCNLhwQQ4xWGizrR1EQRUMDfzznUmhnyM4-oCe0IIqJnjv3fFSrOIL4T-22iKDELaSNANi2V0yyGhzu1Fnfwpbnu47c5p52Z05xgwUbwLpY4pFAXDUqBHOAKXLOJsWGxQmp2R-fprxESoGWj2YJHYK8UMSsQPuSWJL9fR
+        access-token: ya29.a0Adw1xeWcrl8vbtpO_Y5lWqdibnLhv3_vyrxVZEmXZnZ1NU_dUnLxaNQS9_o2Z3SV0QCnX58ssRQhVp6uwZ5n0z9gb7qGCrLu23qm9LEcxEFp-WiThcveGRKBa6lWFBtip0vzJmzB7-lBmjnhvSGN7IDnMMBRn0wBfEEsoCZ30Ry9
         cmd-args: config config-helper --format=json
         cmd-path: /Users/beppe/Downloads/google-cloud-sdk/bin/gcloud
-        expiry: "2020-03-09T12:45:11Z"
+        expiry: "2020-03-10T11:55:30Z"
         expiry-key: '{.credential.token_expiry}'
         token-key: '{.credential.access_token}'
       name: gcp

.kube/configs/minikube

@@ -6,7 +6,7 @@ clusters:
   name: gke_flowfactor_europe-west1-b_ff-stage-euw1-cluster-primary
 - cluster:
     certificate-authority: /Users/beppe/.minikube/ca.crt
-    server: https://192.168.64.9:8443
+    server: https://192.168.64.12:8443
   name: minikube
 contexts:
 - context:
@@ -25,10 +25,10 @@ users:
   user:
     auth-provider:
       config:
-        access-token: ya29.Ima_B591JfK-f9-cjKbrgt2Tn0HqtVrkQPxQUKP3T_HRrf9n8qL89BNckWnW3toV5_g1bGVMR5Nmb51koKSIjPJBtL5CDlb7rXPLayUBq0qzeH1rZ3kQEgwh7uG7V-m3Sv_KQIwqmVM
+        access-token: ya29.ImbBB0-KfQwxJVJfsFqg4Z9Jci54Y41_MMm6_AchhWQEWvdXFVe4tC5hsyD9VWoiAAMXq9n7p-o7ROL-cg7Lx-rwrIE9B0qhMyZMmQ8V7MzPo9vXZuGXG_Lmdx1jhEul2XdDS-eVCaE
         cmd-args: config config-helper --format=json
         cmd-path: /Users/beppe/Downloads/google-cloud-sdk/bin/gcloud
-        expiry: "2020-02-24T13:02:47Z"
+        expiry: "2020-03-09T15:05:25Z"
         expiry-key: '{.credential.token_expiry}'
         token-key: '{.credential.access_token}'
       name: gcp

.zsh/_git

@@ -0,0 +1,244 @@
+#compdef git gitk
+
+# zsh completion wrapper for git
+#
+# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
+#
+# You need git's bash completion script installed somewhere, by default it
+# would be the location bash-completion uses.
+#
+# If your script is somewhere else, you can configure it on your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
+#
+# The recommended way to install this script is to make a copy of it in
+# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following
+# to your ~/.zshrc file:
+#
+#  fpath=(~/.zsh $fpath)
+
+complete ()
+{
+	# do nothing
+	return 0
+}
+
+zstyle -T ':completion:*:*:git:*' tag-order && \
+	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
+
+zstyle -s ":completion:*:*:git:*" script script
+if [ -z "$script" ]; then
+	local -a locations
+	local e
+	locations=(
+		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
+		'/etc/bash_completion.d/git' # fedora, old debian
+		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
+		'/usr/share/bash-completion/git' # gentoo
+		)
+	for e in $locations; do
+		test -f $e && script="$e" && break
+	done
+fi
+GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+
+__gitcomp ()
+{
+	emulate -L zsh
+
+	local cur_="${3-$cur}"
+
+	case "$cur_" in
+	--*=)
+		;;
+	*)
+		local c IFS=$' \t\n'
+		local -a array
+		for c in ${=1}; do
+			c="$c${4-}"
+			case $c in
+			--*=*|*.) ;;
+			*) c="$c " ;;
+			esac
+			array+=("$c")
+		done
+		compset -P '*[=:]'
+		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+		;;
+	esac
+}
+
+__gitcomp_direct ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -- ${=1} && _ret=0
+}
+
+__gitcomp_nl ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+}
+
+__gitcomp_nl_append ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+}
+
+__gitcomp_file_direct ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -f -- ${=1} && _ret=0
+}
+
+__gitcomp_file ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -p "${2-}" -f -- ${=1} && _ret=0
+}
+
+__git_zsh_bash_func ()
+{
+	emulate -L ksh
+
+	local command=$1
+
+	local completion_func="_git_${command//-/_}"
+	declare -f $completion_func >/dev/null && $completion_func && return
+
+	local expansion=$(__git_aliased_command "$command")
+	if [ -n "$expansion" ]; then
+		words[1]=$expansion
+		completion_func="_git_${expansion//-/_}"
+		declare -f $completion_func >/dev/null && $completion_func
+	fi
+}
+
+__git_zsh_cmd_common ()
+{
+	local -a list
+	list=(
+	add:'add file contents to the index'
+	bisect:'find by binary search the change that introduced a bug'
+	branch:'list, create, or delete branches'
+	checkout:'checkout a branch or paths to the working tree'
+	clone:'clone a repository into a new directory'
+	commit:'record changes to the repository'
+	diff:'show changes between commits, commit and working tree, etc'
+	fetch:'download objects and refs from another repository'
+	grep:'print lines matching a pattern'
+	init:'create an empty Git repository or reinitialize an existing one'
+	log:'show commit logs'
+	merge:'join two or more development histories together'
+	mv:'move or rename a file, a directory, or a symlink'
+	pull:'fetch from and merge with another repository or a local branch'
+	push:'update remote refs along with associated objects'
+	rebase:'forward-port local commits to the updated upstream head'
+	reset:'reset current HEAD to the specified state'
+	rm:'remove files from the working tree and from the index'
+	show:'show various types of objects'
+	status:'show the working tree status'
+	tag:'create, list, delete or verify a tag object signed with GPG')
+	_describe -t common-commands 'common commands' list && _ret=0
+}
+
+__git_zsh_cmd_alias ()
+{
+	local -a list
+	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
+	_describe -t alias-commands 'aliases' list $* && _ret=0
+}
+
+__git_zsh_cmd_all ()
+{
+	local -a list
+	emulate ksh -c __git_compute_all_commands
+	list=( ${=__git_all_commands} )
+	_describe -t all-commands 'all commands' list && _ret=0
+}
+
+__git_zsh_main ()
+{
+	local curcontext="$curcontext" state state_descr line
+	typeset -A opt_args
+	local -a orig_words
+
+	orig_words=( ${words[@]} )
+
+	_arguments -C \
+		'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+		'(-p --paginate)--no-pager[do not pipe git output into a pager]' \
+		'--git-dir=-[set the path to the repository]: :_directories' \
+		'--bare[treat the repository as a bare repository]' \
+		'(- :)--version[prints the git suite version]' \
+		'--exec-path=-[path to where your core git programs are installed]:: :_directories' \
+		'--html-path[print the path where git''s HTML documentation is installed]' \
+		'--info-path[print the path where the Info files are installed]' \
+		'--man-path[print the manpath (see `man(1)`) for the man pages]' \
+		'--work-tree=-[set the path to the working tree]: :_directories' \
+		'--namespace=-[set the git namespace]' \
+		'--no-replace-objects[do not use replacement refs to replace git objects]' \
+		'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+		'(-): :->command' \
+		'(-)*:: :->arg' && return
+
+	case $state in
+	(command)
+		_alternative \
+                         'alias-commands:alias:__git_zsh_cmd_alias' \
+                         'common-commands:common:__git_zsh_cmd_common' \
+                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		;;
+	(arg)
+		local command="${words[1]}" __git_dir
+
+		if (( $+opt_args[--bare] )); then
+			__git_dir='.'
+		else
+			__git_dir=${opt_args[--git-dir]}
+		fi
+
+		(( $+opt_args[--help] )) && command='help'
+
+		words=( ${orig_words[@]} )
+
+		__git_zsh_bash_func $command
+		;;
+	esac
+}
+
+_git ()
+{
+	local _ret=1
+	local cur cword prev
+
+	cur=${words[CURRENT]}
+	prev=${words[CURRENT-1]}
+	let cword=CURRENT-1
+
+	if (( $+functions[__${service}_zsh_main] )); then
+		__${service}_zsh_main
+	else
+		emulate ksh -c __${service}_main
+	fi
+
+	let _ret && _default && _ret=0
+	return _ret
+}
+
+_git

.zshrc

@@ -142,3 +142,10 @@ alias virc="vim ~/.zshrc"
 KUBECONFIG=~/.kube/configs/*
 #kubectl completion
 if [ /usr/local/bin/kubectl ]; then source <(kubectl completion zsh); fi
+# Load Git completion
+zstyle ':completion:*:*:git:*' script ~/.zsh/git-completion.bash
+fpath=(~/.zsh $fpath)
+
+autoload -Uz compinit && compinit
+
+