Tidying up

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

7 files changed, 2908 insertions, 1688 deletions

diff --git a/bashrc b/bashrc
index 0a03e7d..cd3ee78 100644
--- a/bashrc
+++ b/bashrc
@@ -31,8 +31,8 @@ alias cd..='cd ..'
 
 # Sources the given file if it really exists.
 source_maybe() {
-    if [ -f $1 ]; then
-        source $1
+    if [ -f "$1" ]; then
+        source "$1"
     fi
 }
 
@@ -59,27 +59,18 @@ export LESS="FSRX"
 export PAGER=less
 
 # git thingies.
-source_maybe $HOME/.gitcompletion.sh
+source_maybe "$HOME/.gitcompletion.sh"
 alias gti=git
 
-# hg thingies.
-source_maybe $HOME/.hgcompletion.sh
-__hg_branch() {
-  if [ -d .hg ]; then
-    local b=`cat .hg/branch`
-    echo -e "\033[0;32m@\033[1;32m$b\033[0m"
-  fi
-}
-
 # Setting up PS1.
-PS1='\u:\w$(__hg_branch)$(__git_ps1 "\[\033[0;32m\]@%s\[\033[0m\]\]") $ '
+PS1='\u:\w$(__git_ps1 "\[\033[0;32m\]@%s\[\033[0m\]\]") $ '
 
 ##
 # Programming languages and environments.
 
 # Rake completion
-if [ -f $HOME/.rake_completion ]; then
-    complete -C $HOME/.rake_completion -o default rake
+if [ -f "$HOME/.rake_completion" ]; then
+    complete -C "$HOME/.rake_completion" -o default rake
 fi
 
 # Alias bundle exec
@@ -99,15 +90,15 @@ export PATH=$GOROOT/bin:$PATH:$GOPATH/bin
 # Misc.
 
 # The g utility. See: https://github.com/mssola/g
-source_maybe $HOME/.g.sh
-source_maybe $HOME/.gcompletion.sh
+source_maybe "$HOME/.g.sh"
+source_maybe "$HOME/.gcompletion.sh"
 
 # Complete the `docker` command if possible.
-source_maybe $HOME/.dockercompletion.sh
+source_maybe "$HOME/.dockercompletion.sh"
 
 # Add the `bin` dir to the path if possible. See:
 # https://github.com/mssola/dotfiles.
-if [ -d $HOME/bin ]; then
+if [ -d "$HOME/bin" ]; then
     export PATH=$HOME/bin:$PATH
 fi
 
@@ -120,7 +111,7 @@ alias ag='ag --nocolor --path-to-ignore ~/.agignore'
 alias random_string="cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1"
 
 # Cargo environment.
-source_maybe $HOME/.cargo/env
+source_maybe "$HOME/.cargo/env"
 
 # SUSE
 export SALT_DIR="$HOME/Projects/kubic-project/salt"
diff --git a/bin/test/test.sh b/bin/test/test.sh
index b9bf1b5..666818a 100755
--- a/bin/test/test.sh
+++ b/bin/test/test.sh
@@ -24,7 +24,7 @@ set +e
 status=0
 
 # license main.cpp
-$license $dir/main.cpp
+$license "$dir/main.cpp"
 d=$(diff "$dir/main.cpp" "$dir/main.cpp.expected")
 if [ ! -z "$d" ]; then
     echo "$d"
@@ -32,7 +32,7 @@ if [ ! -z "$d" ]; then
 fi
 
 # license README.md
-$license $dir/README.md
+$license "$dir/README.md"
 d=$(diff "$dir/README.md" "$dir/README.md.expected")
 if [ ! -z "$d" ]; then
     echo "$d"
diff --git a/bin/toggle-keyboard-layout.sh b/bin/toggle-keyboard-layout.sh
index df1d2bc..cb731dd 100755
--- a/bin/toggle-keyboard-layout.sh
+++ b/bin/toggle-keyboard-layout.sh
@@ -18,7 +18,7 @@
 # to him.
 
 layout=$(setxkbmap -query | awk '/layout/{print $2}')
-if [ $layout == 'us' ]
+if [ "$layout" == 'us' ]
 then
     setxkbmap es
 else
diff --git a/emacs/init.org b/emacs/init.org
index f17fccf..66ed281 100644
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -1379,6 +1379,8 @@ And finally define a proper shortcut.
 
 * org
 
+** TODO org template for creating "article" and similar stuff
+
 [[http://orgmode.org/][org mode]] is an incredible tool that keeps me organized: TODOs, notes, agenda,
 etc. Moreover, it's built in GNU Emacs:
 
@@ -1655,11 +1657,11 @@ I write blog posts with org-mode. Here's the trick:
 (setq org-publish-project-alist
       '(("org-mssola"
          ;; Path to your org files.
-         :base-directory "~/Projects/mssola/jo/org/"
+         :base-directory "~/src/mssola/jo/org/"
          :base-extension "org"
 
          ;; Path to your Jekyll project.
-         :publishing-directory "~/Projects/mssola/jo/_i18n"
+         :publishing-directory "~/src/mssola/jo/_i18n"
          :recursive t
          :publishing-function org-html-publish-to-html
          :headline-levels 4
diff --git a/gitcompletion.sh b/gitcompletion.sh
index 39a5314..9f71bcd 100644
--- a/gitcompletion.sh
+++ b/gitcompletion.sh
@@ -1,5 +1,4 @@
-#
-# bash completion support for core Git.
+# bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
 # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
@@ -11,1255 +10,3087 @@
 #    *) local and remote tag names
 #    *) .git/remotes file names
 #    *) git 'subcommands'
+#    *) git email aliases for git-send-email
 #    *) tree paths within 'ref:path/to/file' expressions
+#    *) file paths within current working directory and index
 #    *) common --long-options
 #
 # To use these routines:
 #
-#    1) Copy this file to somewhere (e.g. ~/.git-completion.sh).
-#    2) Added the following line to your .bashrc:
-#        source ~/.git-completion.sh
+#    1) Copy this file to somewhere (e.g. ~/.git-completion.bash).
+#    2) Add the following line to your .bashrc/.zshrc:
+#        source ~/.git-completion.bash
+#    3) Consider changing your PS1 to also show the current branch,
+#       see git-prompt.sh for details.
+#
+# If you use complex aliases of form '!f() { ... }; f', you can use the null
+# command ':' as the first command in the function body to declare the desired
+# completion style.  For example '!f() { : git commit ; ... }; f' will
+# tell the completion to use commit completion.  This also works with aliases
+# of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
+#
+# Compatible with bash 3.2.57.
+#
+# You can set the following environment variables to influence the behavior of
+# the completion routines:
+#
+#   GIT_COMPLETION_CHECKOUT_NO_GUESS
+#
+#     When set to "1", do not include "DWIM" suggestions in git-checkout
+#     completion (e.g., completing "foo" when "origin/foo" exists).
+
+case "$COMP_WORDBREAKS" in
+*:*) : great ;;
+*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
+esac
+
+# Discovers the path to the git repository taking any '--git-dir=<path>' and
+# '-C <path>' options into account and stores it in the $__git_repo_path
+# variable.
+__git_find_repo_path ()
+{
+	if [ -n "$__git_repo_path" ]; then
+		# we already know where it is
+		return
+	fi
+
+	if [ -n "${__git_C_args-}" ]; then
+		__git_repo_path="$(git "${__git_C_args[@]}" \
+			${__git_dir:+--git-dir="$__git_dir"} \
+			rev-parse --absolute-git-dir 2>/dev/null)"
+	elif [ -n "${__git_dir-}" ]; then
+		test -d "$__git_dir" &&
+		__git_repo_path="$__git_dir"
+	elif [ -n "${GIT_DIR-}" ]; then
+		test -d "${GIT_DIR-}" &&
+		__git_repo_path="$GIT_DIR"
+	elif [ -d .git ]; then
+		__git_repo_path=.git
+	else
+		__git_repo_path="$(git rev-parse --git-dir 2>/dev/null)"
+	fi
+}
+
+# Deprecated: use __git_find_repo_path() and $__git_repo_path instead
+# __gitdir accepts 0 or 1 arguments (i.e., location)
+# returns location of .git repo
+__gitdir ()
+{
+	if [ -z "${1-}" ]; then
+		__git_find_repo_path || return 1
+		echo "$__git_repo_path"
+	elif [ -d "$1/.git" ]; then
+		echo "$1/.git"
+	else
+		echo "$1"
+	fi
+}
+
+# Runs git with all the options given as argument, respecting any
+# '--git-dir=<path>' and '-C <path>' options present on the command line
+__git ()
+{
+	git ${__git_C_args:+"${__git_C_args[@]}"} \
+		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
+}
+
+# Removes backslash escaping, single quotes and double quotes from a word,
+# stores the result in the variable $dequoted_word.
+# 1: The word to dequote.
+__git_dequote ()
+{
+	local rest="$1" len ch
+
+	dequoted_word=""
+
+	while test -n "$rest"; do
+		len=${#dequoted_word}
+		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
+		rest="${rest:$((${#dequoted_word}-$len))}"
+
+		case "${rest:0:1}" in
+		\\)
+			ch="${rest:1:1}"
+			case "$ch" in
+			$'\n')
+				;;
+			*)
+				dequoted_word="$dequoted_word$ch"
+				;;
+			esac
+			rest="${rest:2}"
+			;;
+		\')
+			rest="${rest:1}"
+			len=${#dequoted_word}
+			dequoted_word="$dequoted_word${rest%%\'*}"
+			rest="${rest:$((${#dequoted_word}-$len+1))}"
+			;;
+		\")
+			rest="${rest:1}"
+			while test -n "$rest" ; do
+				len=${#dequoted_word}
+				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
+				rest="${rest:$((${#dequoted_word}-$len))}"
+				case "${rest:0:1}" in
+				\\)
+					ch="${rest:1:1}"
+					case "$ch" in
+					\"|\\|\$|\`)
+						dequoted_word="$dequoted_word$ch"
+						;;
+					$'\n')
+						;;
+					*)
+						dequoted_word="$dequoted_word\\$ch"
+						;;
+					esac
+					rest="${rest:2}"
+					;;
+				\")
+					rest="${rest:1}"
+					break
+					;;
+				esac
+			done
+			;;
+		esac
+	done
+}
+
+# The following function is based on code from:
+#
+#   bash_completion - programmable completion functions for bash 3.2+
 #
-#    3) You may want to make sure the git executable is available
-#       in your PATH before this script is sourced, as some caching
-#       is performed while the script loads.  If git isn't found
-#       at source time then all lookups will be done on demand,
-#       which may be slightly slower.
+#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
+#             © 2009-2010, Bash Completion Maintainers
+#                     <bash-completion-devel@lists.alioth.debian.org>
 #
-#    4) Consider changing your PS1 to also show the current branch:
-#        PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
 #
-#       The argument to __git_ps1 will be displayed only if you
-#       are currently in a git repository.  The %s token will be
-#       the name of the current branch.
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
 #
-# To submit patches:
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+#   The latest version of this software can be obtained here:
+#
+#   http://bash-completion.alioth.debian.org/
+#
+#   RELEASE: 2.x
+
+# This function can be used to access a tokenized list of words
+# on the command line:
 #
-#    *) Read Documentation/SubmittingPatches
-#    *) Send all patches to the current maintainer:
+#	__git_reassemble_comp_words_by_ref '=:'
+#	if test "${words_[cword_-1]}" = -w
+#	then
+#		...
+#	fi
 #
-#       "Shawn O. Pearce" <spearce@spearce.org>
+# The argument should be a collection of characters from the list of
+# word completion separators (COMP_WORDBREAKS) to treat as ordinary
+# characters.
 #
-#    *) Always CC the Git mailing list:
+# This is roughly equivalent to going back in time and setting
+# COMP_WORDBREAKS to exclude those characters.  The intent is to
+# make option types like --date=<type> and <rev>:<path> easy to
+# recognize by treating each shell word as a single token.
 #
-#       git@vger.kernel.org
+# It is best not to set COMP_WORDBREAKS directly because the value is
+# shared with other completion scripts.  By the time the completion
+# function gets called, COMP_WORDS has already been populated so local
+# changes to COMP_WORDBREAKS have no effect.
 #
+# Output: words_, cword_, cur_.
 
-__gitdir ()
+__git_reassemble_comp_words_by_ref()
+{
+	local exclude i j first
+	# Which word separators to exclude?
+	exclude="${1//[^$COMP_WORDBREAKS]}"
+	cword_=$COMP_CWORD
+	if [ -z "$exclude" ]; then
+		words_=("${COMP_WORDS[@]}")
+		return
+	fi
+	# List of word completion separators has shrunk;
+	# re-assemble words to complete.
+	for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+		# Append each nonempty word consisting of just
+		# word separator characters to the current word.
+		first=t
+		while
+			[ $i -gt 0 ] &&
+			[ -n "${COMP_WORDS[$i]}" ] &&
+			# word consists of excluded word separators
+			[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
+		do
+			# Attach to the previous token,
+			# unless the previous token is the command name.
+			if [ $j -ge 2 ] && [ -n "$first" ]; then
+				((j--))
+			fi
+			first=
+			words_[$j]=${words_[j]}${COMP_WORDS[i]}
+			if [ $i = $COMP_CWORD ]; then
+				cword_=$j
+			fi
+			if (($i < ${#COMP_WORDS[@]} - 1)); then
+				((i++))
+			else
+				# Done.
+				return
+			fi
+		done
+		words_[$j]=${words_[j]}${COMP_WORDS[i]}
+		if [ $i = $COMP_CWORD ]; then
+			cword_=$j
+		fi
+	done
+}
+
+if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
+_get_comp_words_by_ref ()
 {
-    if [ -z "$1" ]; then
-        if [ -n "$__git_dir" ]; then
-            echo "$__git_dir"
-        elif [ -d .git ]; then
-            echo .git
-        else
-            git rev-parse --git-dir 2>/dev/null
-        fi
-    elif [ -d "$1/.git" ]; then
-        echo "$1/.git"
-    else
-        echo "$1"
-    fi
-}
-
-__git_ps1 ()
-{
-    local b="$(git symbolic-ref HEAD 2>/dev/null)"
-    if [ -n "$b" ]; then
-        if [ -n "$1" ]; then
-            printf "$1" "${b##refs/heads/}"
-        else
-            printf " (%s)" "${b##refs/heads/}"
-        fi
-    fi
+	local exclude cur_ words_ cword_
+	if [ "$1" = "-n" ]; then
+		exclude=$2
+		shift 2
+	fi
+	__git_reassemble_comp_words_by_ref "$exclude"
+	cur_=${words_[cword_]}
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		cur)
+			cur=$cur_
+			;;
+		prev)
+			prev=${words_[$cword_-1]}
+			;;
+		words)
+			words=("${words_[@]}")
+			;;
+		cword)
+			cword=$cword_
+			;;
+		esac
+		shift
+	done
 }
+fi
+
+# Fills the COMPREPLY array with prefiltered words without any additional
+# processing.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct ()
+{
+	local IFS=$'\n'
 
+	COMPREPLY=($1)
+}
+
+__gitcompappend ()
+{
+	local x i=${#COMPREPLY[@]}
+	for x in $1; do
+		if [[ "$x" == "$3"* ]]; then
+			COMPREPLY[i++]="$2$x$4"
+		fi
+	done
+}
+
+__gitcompadd ()
+{
+	COMPREPLY=()
+	__gitcompappend "$@"
+}
+
+# Generates completion reply, appending a space to possible completion words,
+# if necessary.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
 __gitcomp ()
 {
-    local all c s=$'\n' IFS=' '$'\t'$'\n'
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    if [ $# -gt 2 ]; then
-        cur="$3"
-    fi
-    for c in $1; do
-        case "$c$4" in
-        --*=*) all="$all$c$4$s" ;;
-        *.)    all="$all$c$4$s" ;;
-        *)     all="$all$c$4 $s" ;;
-        esac
-    done
-    IFS=$s
-    COMPREPLY=($(compgen -P "$2" -W "$all" -- "$cur"))
-    return
+	local cur_="${3-$cur}"
+
+	case "$cur_" in
+	--*=)
+		;;
+	--no-*)
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
+		;;
+	*)
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				if [[ $c == "$cur_"* ]]; then
+					COMPREPLY[i++]="${2-}$c "
+				fi
+				break
+			fi
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
+		;;
+	esac
+}
+
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+if [[ -n ${ZSH_VERSION-} ]]; then
+	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
+else
+	unset $(compgen -v __gitcomp_builtin_)
+fi
+
+# This function is equivalent to
+#
+#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#
+# except that the output is cached. Accept 1-3 arguments:
+# 1: the git command to execute, this is also the cache key
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
+{
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="$2"
+	local excl="$3"
+
+	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local options
+	eval "options=\$$var"
+
+	if [ -z "$options" ]; then
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
+		for i in $excl; do
+			options="${options/ $i / }"
+		done
+		eval "$var=\"$options\""
+	fi
+
+	__gitcomp "$options"
+}
+
+# Variation of __gitcomp_nl () that appends to the existing list of
+# completion candidates, COMPREPLY.
+__gitcomp_nl_append ()
+{
+	local IFS=$'\n'
+	__gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
+# Generates completion reply from newline-separated possible completion words
+# by appending a space to all of them.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words, separated by a single newline.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word instead of
+#    the default space (optional).  If specified but empty, nothing is
+#    appended.
+__gitcomp_nl ()
+{
+	COMPREPLY=()
+	__gitcomp_nl_append "$@"
+}
+
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY=($1)
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Generates completion reply with compgen from newline-separated possible
+# completion filenames.
+# It accepts 1 to 3 arguments:
+# 1: List of possible completion filenames, separated by a single newline.
+# 2: A directory prefix to be added to each possible completion filename
+#    (optional).
+# 3: Generate possible completion matches for this word (optional).
+__gitcomp_file ()
+{
+	local IFS=$'\n'
+
+	# XXX does not work when the directory prefix contains a tilde,
+	# since tilde expansion is not applied.
+	# This means that COMPREPLY will be empty and Bash default
+	# completion will be used.
+	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Execute 'git ls-files', unless the --committable option is specified, in
+# which case it runs 'git diff-index' to find out the files that can be
+# committed.  It return paths relative to the directory specified in the first
+# argument, and using the options specified in the second argument.
+__git_ls_files_helper ()
+{
+	if [ "$2" == "--committable" ]; then
+		__git -C "$1" -c core.quotePath=false diff-index \
+			--name-only --relative HEAD -- "${3//\\/\\\\}*"
+	else
+		# NOTE: $2 is not quoted in order to support multiple options
+		__git -C "$1" -c core.quotePath=false ls-files \
+			--exclude-standard $2 -- "${3//\\/\\\\}*"
+	fi
 }
 
+
+# __git_index_files accepts 1 or 2 arguments:
+# 1: Options to pass to ls-files (required).
+# 2: A directory path (optional).
+#    If provided, only files within the specified directory are listed.
+#    Sub directories are never recursed.  Path must have a trailing
+#    slash.
+# 3: List only paths matching this path component (optional).
+__git_index_files ()
+{
+	local root="$2" match="$3"
+
+	__git_ls_files_helper "$root" "$1" "$match" |
+	awk -F / -v pfx="${2//\\/\\\\}" '{
+		paths[$1] = 1
+	}
+	END {
+		for (p in paths) {
+			if (substr(p, 1, 1) != "\"") {
+				# No special characters, easy!
+				print pfx p
+				continue
+			}
+
+			# The path is quoted.
+			p = dequote(p)
+			if (p == "")
+				continue
+
+			# Even when a directory name itself does not contain
+			# any special characters, it will still be quoted if
+			# any of its (stripped) trailing path components do.
+			# Because of this we may have seen the same direcory
+			# both quoted and unquoted.
+			if (p in paths)
+				# We have seen the same directory unquoted,
+				# skip it.
+				continue
+			else
+				print pfx p
+		}
+	}
+	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
+		# Skip opening double quote.
+		p = substr(p, 2)
+
+		# Interpret backslash escape sequences.
+		while ((bs_idx = index(p, "\\")) != 0) {
+			out = out substr(p, 1, bs_idx - 1)
+			esc = substr(p, bs_idx + 1, 1)
+			p = substr(p, bs_idx + 2)
+
+			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
+				# C-style one-character escape sequence.
+				out = out substr("\a\b\t\v\f\r\"\\",
+						 esc_idx, 1)
+			} else if (esc == "n") {
+				# Uh-oh, a newline character.
+				# We cant reliably put a pathname
+				# containing a newline into COMPREPLY,
+				# and the newline would create a mess.
+				# Skip this path.
+				return ""
+			} else {
+				# Must be a \nnn octal value, then.
+				dec = esc             * 64 + \
+				      substr(p, 1, 1) * 8  + \
+				      substr(p, 2, 1)
+				out = out sprintf("%c", dec)
+				p = substr(p, 3)
+			}
+		}
+		# Drop closing double quote, if there is one.
+		# (There isnt any if this is a directory, as it was
+		# already stripped with the trailing path components.)
+		if (substr(p, length(p), 1) == "\"")
+			out = out substr(p, 1, length(p) - 1)
+		else
+			out = out p
+
+		return out
+	}'
+}
+
+# __git_complete_index_file requires 1 argument:
+# 1: the options to pass to ls-file
+#
+# The exception is --committable, which finds the files appropriate commit.
+__git_complete_index_file ()
+{
+	local dequoted_word pfx="" cur_
+
+	__git_dequote "$cur"
+
+	case "$dequoted_word" in
+	?*/*)
+		pfx="${dequoted_word%/*}/"
+		cur_="${dequoted_word##*/}"
+		;;
+	*)
+		cur_="$dequoted_word"
+	esac
+
+	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
+}
+
+# Lists branches from the local repository.
+# 1: A prefix to be added to each listed branch (optional).
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
 __git_heads ()
 {
-    local cmd i is_hash=y dir="$(__gitdir "$1")"
-    if [ -d "$dir" ]; then
-        for i in $(git --git-dir="$dir" \
-            for-each-ref --format='%(refname)' \
-            refs/heads ); do
-            echo "${i#refs/heads/}"
-        done
-        return
-    fi
-    for i in $(git-ls-remote "$1" 2>/dev/null); do
-        case "$is_hash,$i" in
-        y,*) is_hash=n ;;
-        n,*^{}) is_hash=y ;;
-        n,refs/heads/*) is_hash=y; echo "${i#refs/heads/}" ;;
-        n,*) is_hash=y; echo "$i" ;;
-        esac
-    done
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
+# Lists tags from the local repository.
+# Accepts the same positional parameters as __git_heads() above.
 __git_tags ()
 {
-    local cmd i is_hash=y dir="$(__gitdir "$1")"
-    if [ -d "$dir" ]; then
-        for i in $(git --git-dir="$dir" \
-            for-each-ref --format='%(refname)' \
-            refs/tags ); do
-            echo "${i#refs/tags/}"
-        done
-        return
-    fi
-    for i in $(git-ls-remote "$1" 2>/dev/null); do
-        case "$is_hash,$i" in
-        y,*) is_hash=n ;;
-        n,*^{}) is_hash=y ;;
-        n,refs/tags/*) is_hash=y; echo "${i#refs/tags/}" ;;
-        n,*) is_hash=y; echo "$i" ;;
-        esac
-    done
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
+# Lists refs from the local (by default) or from a remote repository.
+# It accepts 0, 1 or 2 arguments:
+# 1: The remote to list refs from (optional; ignored, if set but empty).
+#    Can be the name of a configured remote, a path, or a URL.
+# 2: In addition to local refs, list unique branches from refs/remotes/ for
+#    'git checkout's tracking DWIMery (optional; ignored, if set but empty).
+# 3: A prefix to be added to each listed ref (optional).
+# 4: List only refs matching this word (optional; list all refs if unset or
+#    empty).
+# 5: A suffix to be appended to each listed ref (optional; ignored, if set
+#    but empty).
+#
+# Use __git_complete_refs() instead.
 __git_refs ()
 {
-    local cmd i is_hash=y dir="$(__gitdir "$1")"
-    if [ -d "$dir" ]; then
-        if [ -e "$dir/HEAD" ]; then echo HEAD; fi
-        for i in $(git --git-dir="$dir" \
-            for-each-ref --format='%(refname)' \
-            refs/tags refs/heads refs/remotes); do
-            case "$i" in
-                refs/tags/*)    echo "${i#refs/tags/}" ;;
-                refs/heads/*)   echo "${i#refs/heads/}" ;;
-                refs/remotes/*) echo "${i#refs/remotes/}" ;;
-                *)              echo "$i" ;;
-            esac
-        done
-        return
-    fi
-    for i in $(git-ls-remote "$dir" 2>/dev/null); do
-        case "$is_hash,$i" in
-        y,*) is_hash=n ;;
-        n,*^{}) is_hash=y ;;
-        n,refs/tags/*) is_hash=y; echo "${i#refs/tags/}" ;;
-        n,refs/heads/*) is_hash=y; echo "${i#refs/heads/}" ;;
-        n,refs/remotes/*) is_hash=y; echo "${i#refs/remotes/}" ;;
-        n,*) is_hash=y; echo "$i" ;;
-        esac
-    done
+	local i hash dir track="${2-}"
+	local list_refs_from=path remote="${1-}"
+	local format refs
+	local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}"
+	local match="${4-}"
+	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
+
+	__git_find_repo_path
+	dir="$__git_repo_path"
+
+	if [ -z "$remote" ]; then
+		if [ -z "$dir" ]; then
+			return
+		fi
+	else
+		if __git_is_configured_remote "$remote"; then
+			# configured remote takes precedence over a
+			# local directory with the same name
+			list_refs_from=remote
+		elif [ -d "$remote/.git" ]; then
+			dir="$remote/.git"
+		elif [ -d "$remote" ]; then
+			dir="$remote"
+		else
+			list_refs_from=url
+		fi
+	fi
+
+	if [ "$list_refs_from" = path ]; then
+		if [[ "$cur_" == ^* ]]; then
+			pfx="$pfx^"
+			fer_pfx="$fer_pfx^"
+			cur_=${cur_#^}
+			match=${match#^}
+		fi
+		case "$cur_" in
+		refs|refs/*)
+			format="refname"
+			refs=("$match*" "$match*/**")
+			track=""
+			;;
+		*)
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+				case "$i" in
+				$match*)
+					if [ -e "$dir/$i" ]; then
+						echo "$pfx$i$sfx"
+					fi
+					;;
+				esac
+			done
+			format="refname:strip=2"
+			refs=("refs/tags/$match*" "refs/tags/$match*/**"
+				"refs/heads/$match*" "refs/heads/$match*/**"
+				"refs/remotes/$match*" "refs/remotes/$match*/**")
+			;;
+		esac
+		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
+			"${refs[@]}"
+		if [ -n "$track" ]; then
+			# employ the heuristic used by git checkout
+			# Try to find a remote branch that matches the completion word
+			# but only output if the branch name is unique
+			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+				--sort="refname:strip=3" \
+				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
+			uniq -u
+		fi
+		return
+	fi
+	case "$cur_" in
+	refs|refs/*)
+		__git ls-remote "$remote" "$match*" | \
+		while read -r hash i; do
+			case "$i" in
+			*^{}) ;;
+			*) echo "$pfx$i$sfx" ;;
+			esac
+		done
+		;;
+	*)
+		if [ "$list_refs_from" = remote ]; then
+			case "HEAD" in
+			$match*)	echo "${pfx}HEAD$sfx" ;;
+			esac
+			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+				"refs/remotes/$remote/$match*" \
+				"refs/remotes/$remote/$match*/**"
+		else
+			local query_symref
+			case "HEAD" in
+			$match*)	query_symref="HEAD" ;;
+			esac
+			__git ls-remote "$remote" $query_symref \
+				"refs/tags/$match*" "refs/heads/$match*" \
+				"refs/remotes/$match*" |
+			while read -r hash i; do
+				case "$i" in
+				*^{})	;;
+				refs/*)	echo "$pfx${i#refs/*/}$sfx" ;;
+				*)	echo "$pfx$i$sfx" ;;  # symbolic refs
+				esac
+			done
+		fi
+		;;
+	esac
 }
 
+# Completes refs, short and long, local and remote, symbolic and pseudo.
+#
+# Usage: __git_complete_refs [<option>]...
+# --remote=<remote>: The remote to list refs from, can be the name of a
+#                    configured remote, a path, or a URL.
+# --track: List unique remote branches for 'git checkout's tracking DWIMery.
+# --pfx=<prefix>: A prefix to be added to each ref.
+# --cur=<word>: The current ref to be completed.  Defaults to the current
+#               word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each ref instead of the default
+#                 space.
+__git_complete_refs ()
+{
+	local remote track pfx cur_="$cur" sfx=" "
+
+	while test $# != 0; do
+		case "$1" in
+		--remote=*)	remote="${1##--remote=}" ;;
+		--track)	track="yes" ;;
+		--pfx=*)	pfx="${1##--pfx=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
+}
+
+# __git_refs2 requires 1 argument (to pass to __git_refs)
+# Deprecated: use __git_complete_fetch_refspecs() instead.
 __git_refs2 ()
 {
-    local i
-    for i in $(__git_refs "$1"); do
-        echo "$i:$i"
-    done
+	local i
+	for i in $(__git_refs "$1"); do
+		echo "$i:$i"
+	done
+}
+
+# Completes refspecs for fetching from a remote repository.
+# 1: The remote repository.
+# 2: A prefix to be added to each listed refspec (optional).
+# 3: The ref to be completed as a refspec instead of the current word to be
+#    completed (optional)
+# 4: A suffix to be appended to each listed refspec instead of the default
+#    space (optional).
+__git_complete_fetch_refspecs ()
+{
+	local i remote="$1" pfx="${2-}" cur_="${3-$cur}" sfx="${4- }"
+
+	__gitcomp_direct "$(
+		for i in $(__git_refs "$remote" "" "" "$cur_") ; do
+			echo "$pfx$i:$i$sfx"
+		done
+		)"
 }
 
+# __git_refs_remotes requires 1 argument (to pass to ls-remote)
 __git_refs_remotes ()
 {
-    local cmd i is_hash=y
-    for i in $(git-ls-remote "$1" 2>/dev/null); do
-        case "$is_hash,$i" in
-        n,refs/heads/*)
-            is_hash=y
-            echo "$i:refs/remotes/$1/${i#refs/heads/}"
-            ;;
-        y,*) is_hash=n ;;
-        n,*^{}) is_hash=y ;;
-        n,refs/tags/*) is_hash=y;;
-        n,*) is_hash=y; ;;
-        esac
-    done
+	local i hash
+	__git ls-remote "$1" 'refs/heads/*' | \
+	while read -r hash i; do
+		echo "$i:refs/remotes/$1/${i#refs/heads/}"
+	done
 }
 
 __git_remotes ()
 {
-    local i ngoff IFS=$'\n' d="$(__gitdir)"
-    shopt -q nullglob || ngoff=1
-    shopt -s nullglob
-    for i in "$d/remotes"/*; do
-        echo ${i#$d/remotes/}
-    done
-    [ "$ngoff" ] && shopt -u nullglob
-    for i in $(git --git-dir="$d" config --list); do
-        case "$i" in
-        remote.*.url=*)
-            i="${i#remote.}"
-            echo "${i/.url=*/}"
-            ;;
-        esac
-    done
-}
-
-__git_merge_strategies ()
-{
-    if [ -n "$__git_merge_strategylist" ]; then
-        echo "$__git_merge_strategylist"
-        return
-    fi
-    sed -n "/^all_strategies='/{
-        s/^all_strategies='//
-        s/'//
-        p
-        q
-        }" "$(git --exec-path)/git-merge"
-}
-__git_merge_strategylist=
-__git_merge_strategylist="$(__git_merge_strategies 2>/dev/null)"
+	__git_find_repo_path
+	test -d "$__git_repo_path/remotes" && ls -1 "$__git_repo_path/remotes"
+	__git remote
+}
+
+# Returns true if $1 matches the name of a configured remote, false otherwise.
+__git_is_configured_remote ()
+{
+	local remote
+	for remote in $(__git_remotes); do
+		if [ "$remote" = "$1" ]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+__git_list_merge_strategies ()
+{
+	LANG=C LC_ALL=C git merge -s help 2>&1 |
+	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
+		s/\.$//
+		s/.*://
+		s/^[ 	]*//
+		s/[ 	]*$//
+		p
+	}'
+}
+
+__git_merge_strategies=
+# 'git merge -s help' (and thus detection of the merge strategy
+# list) fails, unfortunately, if run outside of any git working
+# tree.  __git_merge_strategies is set to the empty string in
+# that case, and the detection will be repeated the next time it
+# is needed.
+__git_compute_merge_strategies ()
+{
+	test -n "$__git_merge_strategies" ||
+	__git_merge_strategies=$(__git_list_merge_strategies)
+}
+
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+	histogram diff-algorithm= ignore-space-change ignore-all-space
+	ignore-space-at-eol renormalize no-renormalize no-renames
+	find-renames find-renames= rename-threshold="
+
+__git_complete_revlist_file ()
+{
+	local dequoted_word pfx ls ref cur_="$cur"
+	case "$cur_" in
+	*..?*:*)
+		return
+		;;
+	?*:*)
+		ref="${cur_%%:*}"
+		cur_="${cur_#*:}"
+
+		__git_dequote "$cur_"
+
+		case "$dequoted_word" in
+		?*/*)
+			pfx="${dequoted_word%/*}"
+			cur_="${dequoted_word##*/}"
+			ls="$ref:$pfx"
+			pfx="$pfx/"
+			;;
+		*)
+			cur_="$dequoted_word"
+			ls="$ref"
+			;;
+		esac
+
+		case "$COMP_WORDBREAKS" in
+		*:*) : great ;;
+		*)   pfx="$ref:$pfx" ;;
+		esac
+
+		__gitcomp_file "$(__git ls-tree "$ls" \
+				| sed 's/^.*	//
+				       s/$//')" \
+			"$pfx" "$cur_"
+		;;
+	*...*)
+		pfx="${cur_%...*}..."
+		cur_="${cur_#*...}"
+		__git_complete_refs --pfx="$pfx" --cur="$cur_"
+		;;
+	*..*)
+		pfx="${cur_%..*}.."
+		cur_="${cur_#*..}"
+		__git_complete_refs --pfx="$pfx" --cur="$cur_"
+		;;
+	*)
+		__git_complete_refs
+		;;
+	esac
+}
 
 __git_complete_file ()
 {
-    local pfx ls ref cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    ?*:*)
-        ref="${cur%%:*}"
-        cur="${cur#*:}"
-        case "$cur" in
-        ?*/*)
-            pfx="${cur%/*}"
-            cur="${cur##*/}"
-            ls="$ref:$pfx"
-            pfx="$pfx/"
-            ;;
-        *)
-            ls="$ref"
-            ;;
-        esac
-        COMPREPLY=($(compgen -P "$pfx" \
-            -W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
-                | sed '/^100... blob /s,^.* ,,
-                       /^040000 tree /{
-                           s,^.*    ,,
-                           s,$,/,
-                       }
-                       s/^.*    //')" \
-            -- "$cur"))
-        ;;
-    *)
-        __gitcomp "$(__git_refs)"
-        ;;
-    esac
+	__git_complete_revlist_file
 }
 
 __git_complete_revlist ()
 {
-    local pfx cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    *...*)
-        pfx="${cur%...*}..."
-        cur="${cur#*...}"
-        __gitcomp "$(__git_refs)" "$pfx" "$cur"
-        ;;
-    *..*)
-        pfx="${cur%..*}.."
-        cur="${cur#*..}"
-        __gitcomp "$(__git_refs)" "$pfx" "$cur"
-        ;;
-    *.)
-        __gitcomp "$cur."
-        ;;
-    *)
-        __gitcomp "$(__git_refs)"
-        ;;
-    esac
-}
-
-__git_commands ()
-{
-    if [ -n "$__git_commandlist" ]; then
-        echo "$__git_commandlist"
-        return
-    fi
-    local i IFS=" "$'\n'
-    for i in $(git help -a|egrep '^ ')
-    do
-        case $i in
-        *--*)             : helper pattern;;
-        applymbox)        : ask gittus;;
-        applypatch)       : ask gittus;;
-        archimport)       : import;;
-        cat-file)         : plumbing;;
-        check-attr)       : plumbing;;
-        check-ref-format) : plumbing;;
-        commit-tree)      : plumbing;;
-        cvsexportcommit)  : export;;
-        cvsimport)        : import;;
-        cvsserver)        : daemon;;
-        daemon)           : daemon;;
-        diff-files)       : plumbing;;
-        diff-index)       : plumbing;;
-        diff-tree)        : plumbing;;
-        fast-import)      : import;;
-        fsck-objects)     : plumbing;;
-        fetch-pack)       : plumbing;;
-        fmt-merge-msg)    : plumbing;;
-        for-each-ref)     : plumbing;;
-        hash-object)      : plumbing;;
-        http-*)           : transport;;
-        index-pack)       : plumbing;;
-        init-db)          : deprecated;;
-        local-fetch)      : plumbing;;
-        mailinfo)         : plumbing;;
-        mailsplit)        : plumbing;;
-        merge-*)          : plumbing;;
-        mktree)           : plumbing;;
-        mktag)            : plumbing;;
-        pack-objects)     : plumbing;;
-        pack-redundant)   : plumbing;;
-        pack-refs)        : plumbing;;
-        parse-remote)     : plumbing;;
-        patch-id)         : plumbing;;
-        peek-remote)      : plumbing;;
-        prune)            : plumbing;;
-        prune-packed)     : plumbing;;
-        quiltimport)      : import;;
-        read-tree)        : plumbing;;
-        receive-pack)     : plumbing;;
-        reflog)           : plumbing;;
-        repo-config)      : deprecated;;
-        rerere)           : plumbing;;
-        rev-list)         : plumbing;;
-        rev-parse)        : plumbing;;
-        runstatus)        : plumbing;;
-        sh-setup)         : internal;;
-        shell)            : daemon;;
-        send-pack)        : plumbing;;
-        show-index)       : plumbing;;
-        ssh-*)            : transport;;
-        stripspace)       : plumbing;;
-        svn)              : import export;;
-        symbolic-ref)     : plumbing;;
-        tar-tree)         : deprecated;;
-        unpack-file)      : plumbing;;
-        unpack-objects)   : plumbing;;
-        update-index)     : plumbing;;
-        update-ref)       : plumbing;;
-        update-server-info) : daemon;;
-        upload-archive)   : plumbing;;
-        upload-pack)      : plumbing;;
-        write-tree)       : plumbing;;
-        verify-tag)       : plumbing;;
-        *) echo $i;;
-        esac
-    done
-}
-__git_commandlist=
-__git_commandlist="$(__git_commands 2>/dev/null)"
-
-__git_aliases ()
-{
-    local i IFS=$'\n'
-    for i in $(git --git-dir="$(__gitdir)" config --list); do
-        case "$i" in
-        alias.*)
-            i="${i#alias.}"
-            echo "${i/=*/}"
-            ;;
-        esac
-    done
+	__git_complete_revlist_file
+}
+
+__git_complete_remote_or_refspec ()
+{
+	local cur_="$cur" cmd="${words[1]}"
+	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
+	if [ "$cmd" = "remote" ]; then
+		((c++))
+	fi
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
+		-d|--delete) [ "$cmd" = "push" ] && lhs=0 ;;
+		--all)
+			case "$cmd" in
+			push) no_complete_refspec=1 ;;
+			fetch)
+				return
+				;;
+			*) ;;
+			esac
+			;;
+		--multiple) no_complete_refspec=1; break ;;
+		-*) ;;
+		*) remote="$i"; break ;;
+		esac
+		((c++))
+	done
+	if [ -z "$remote" ]; then
+		__gitcomp_nl "$(__git_remotes)"
+		return
+	fi
+	if [ $no_complete_refspec = 1 ]; then
+		return
+	fi
+	[ "$remote" = "." ] && remote=
+	case "$cur_" in
+	*:*)
+		case "$COMP_WORDBREAKS" in
+		*:*) : great ;;
+		*)   pfx="${cur_%%:*}:" ;;
+		esac
+		cur_="${cur_#*:}"
+		lhs=0
+		;;
+	+*)
+		pfx="+"
+		cur_="${cur_#+}"
+		;;
+	esac
+	case "$cmd" in
+	fetch)
+		if [ $lhs = 1 ]; then
+			__git_complete_fetch_refspecs "$remote" "$pfx" "$cur_"
+		else
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
+		fi
+		;;
+	pull|remote)
+		if [ $lhs = 1 ]; then
+			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
+		else
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
+		fi
+		;;
+	push)
+		if [ $lhs = 1 ]; then
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
+		else
+			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
+		fi
+		;;
+	esac
 }
 
+__git_complete_strategy ()
+{
+	__git_compute_merge_strategies
+	case "$prev" in
+	-s|--strategy)
+		__gitcomp "$__git_merge_strategies"
+		return 0
+		;;
+	-X)
+		__gitcomp "$__git_merge_strategy_options"
+		return 0
+		;;
+	esac
+	case "$cur" in
+	--strategy=*)
+		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
+		return 0
+		;;
+	--strategy-option=*)
+		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		return 0
+		;;
+	esac
+	return 1
+}
+
+__git_all_commands=
+__git_compute_all_commands ()
+{
+	test -n "$__git_all_commands" ||
+	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
+}
+
+# Lists all set config variables starting with the given section prefix,
+# with the prefix removed.
+__git_get_config_variables ()
+{
+	local section="$1" i IFS=$'\n'
+	for i in $(__git config --name-only --get-regexp "^$section\..*"); do
+		echo "${i#$section.}"
+	done
+}
+
+__git_pretty_aliases ()
+{
+	__git_get_config_variables "pretty"
+}
+
+# __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-    local word cmdline=$(git --git-dir="$(__gitdir)" \
-        config --get "alias.$1")
-    for word in $cmdline; do
-        if [ "${word##-*}" ]; then
-            echo $word
-            return
-        fi
-    done
+	local word cmdline=$(__git config --get "alias.$1")
+	for word in $cmdline; do
+		case "$word" in
+		\!gitk|gitk)
+			echo "gitk"
+			return
+			;;
+		\!*)	: shell command alias ;;
+		-*)	: option ;;
+		*=*)	: setting env ;;
+		git)	: git itself ;;
+		\(\))   : skip parens of shell function definition ;;
+		{)	: skip start of shell helper function ;;
+		:)	: skip null command ;;
+		\'*)	: skip opening quote after sh -c ;;
+		*)
+			echo "$word"
+			return
+		esac
+	done
 }
 
-__git_whitespacelist="nowarn warn error error-all strip"
+# __git_find_on_cmdline requires 1 argument
+__git_find_on_cmdline ()
+{
+	local word subcommand c=1
+	while [ $c -lt $cword ]; do
+		word="${words[c]}"
+		for subcommand in $1; do
+			if [ "$subcommand" = "$word" ]; then
+				echo "$subcommand"
+				return
+			fi
+		done
+		((c++))
+	done
+}
+
+# Echo the value of an option set on the command line or config
+#
+# $1: short option name
+# $2: long option name including =
+# $3: list of possible values
+# $4: config string (optional)
+#
+# example:
+# result="$(__git_get_option_value "-d" "--do-something=" \
+#     "yes no" "core.doSomething")"
+#
+# result is then either empty (no option set) or "yes" or "no"
+#
+# __git_get_option_value requires 3 arguments
+__git_get_option_value ()
+{
+	local c short_opt long_opt val
+	local result= values config_key word
+
+	short_opt="$1"
+	long_opt="$2"
+	values="$3"
+	config_key="$4"
+
+	((c = $cword - 1))
+	while [ $c -ge 0 ]; do
+		word="${words[c]}"
+		for val in $values; do
+			if [ "$short_opt$val" = "$word" ] ||
+			   [ "$long_opt$val"  = "$word" ]; then
+				result="$val"
+				break 2
+			fi
+		done
+		((c--))
+	done
+
+	if [ -n "$config_key" ] && [ -z "$result" ]; then
+		result="$(__git config "$config_key")"
+	fi
+
+	echo "$result"
+}
+
+__git_has_doubledash ()
+{
+	local c=1
+	while [ $c -lt $cword ]; do
+		if [ "--" = "${words[c]}" ]; then
+			return 0
+		fi
+		((c++))
+	done
+	return 1
+}
+
+# Try to count non option arguments passed on the command line for the
+# specified git command.
+# When options are used, it is necessary to use the special -- option to
+# tell the implementation were non option arguments begin.
+# XXX this can not be improved, since options can appear everywhere, as
+# an example:
+#	git mv x -n y
+#
+# __git_count_arguments requires 1 argument: the git command executed.
+__git_count_arguments ()
+{
+	local word i c=0
+
+	# Skip "git" (first argument)
+	for ((i=1; i < ${#words[@]}; i++)); do
+		word="${words[i]}"
+
+		case "$word" in
+			--)
+				# Good; we can assume that the following are only non
+				# option arguments.
+				((c = 0))
+				;;
+			"$1")
+				# Skip the specified git command and discard git
+				# main options
+				((c = 0))
+				;;
+			?*)
+				((c++))
+				;;
+		esac
+	done
+
+	printf "%d" $c
+}
+
+__git_whitespacelist="nowarn warn error error-all fix"
+__git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    if [ -d .dotest ]; then
-        __gitcomp "--skip --resolved"
-        return
-    fi
-    case "$cur" in
-    --whitespace=*)
-        __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
-        return
-        ;;
-    --*)
-        __gitcomp "
-            --signoff --utf8 --binary --3way --interactive
-            --whitespace=
-            "
-        return
-    esac
-    COMPREPLY=()
+	__git_find_repo_path
+	if [ -d "$__git_repo_path"/rebase-apply ]; then
+		__gitcomp "$__git_am_inprogress_options"
+		return
+	fi
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--patch-format=*)
+		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin am "" \
+			"$__git_am_inprogress_options"
+		return
+	esac
 }
 
 _git_apply ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --whitespace=*)
-        __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
-        return
-        ;;
-    --*)
-        __gitcomp "
-            --stat --numstat --summary --check --index
-            --cached --index-info --reverse --reject --unidiff-zero
-            --apply --no-add --exclude=
-            --whitespace= --inaccurate-eof --verbose
-            "
-        return
-    esac
-    COMPREPLY=()
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin apply
+		return
+	esac
 }
 
 _git_add ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--interactive --refresh"
-        return
-    esac
-    COMPREPLY=()
+	case "$cur" in
+	--chmod=*)
+		__gitcomp "+x -x" "" "${cur##--chmod=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin add
+		return
+	esac
+
+	local complete_opt="--others --modified --directory --no-empty-directory"
+	if test -n "$(__git_find_on_cmdline "-u --update")"
+	then
+		complete_opt="--modified"
+	fi
+	__git_complete_index_file "$complete_opt"
+}
+
+_git_archive ()
+{
+	case "$cur" in
+	--format=*)
+		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		return
+		;;
+	--remote=*)
+		__gitcomp_nl "$(__git_remotes)" "" "${cur##--remote=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--format= --list --verbose
+			--prefix= --remote= --exec= --output
+			"
+		return
+		;;
+	esac
+	__git_complete_file
 }
 
 _git_bisect ()
 {
-    local i c=1 command
-    while [ $c -lt $COMP_CWORD ]; do
-        i="${COMP_WORDS[c]}"
-        case "$i" in
-        start|bad|good|reset|visualize|replay|log)
-            command="$i"
-            break
-            ;;
-        esac
-        c=$((++c))
-    done
-
-    if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
-        __gitcomp "start bad good reset visualize replay log"
-        return
-    fi
-
-    case "$command" in
-    bad|good|reset)
-        __gitcomp "$(__git_refs)"
-        ;;
-    *)
-        COMPREPLY=()
-        ;;
-    esac
+	__git_has_doubledash && return
+
+	local subcommands="start bad good skip reset visualize replay log run"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__git_find_repo_path
+		if [ -f "$__git_repo_path"/BISECT_START ]; then
+			__gitcomp "$subcommands"
+		else
+			__gitcomp "replay start"
+		fi
+		return
+	fi
+
+	case "$subcommand" in
+	bad|good|reset|skip|start)
+		__git_complete_refs
+		;;
+	*)
+		;;
+	esac
 }
 
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
 _git_branch ()
 {
-    __gitcomp "$(__git_refs)"
+	local i c=1 only_local_ref="n" has_r="n"
+
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		-d|--delete|-m|--move)	only_local_ref="y" ;;
+		-r|--remotes)		has_r="y" ;;
+		esac
+		((c++))
+	done
+
+	case "$cur" in
+	--set-upstream-to=*)
+		__git_complete_refs --cur="${cur##--set-upstream-to=}"
+		;;
+	--*)
+		__gitcomp_builtin branch
+		;;
+	*)
+		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
+			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
+		else
+			__git_complete_refs
+		fi
+		;;
+	esac
 }
 
 _git_bundle ()
 {
-    local mycword="$COMP_CWORD"
-    case "${COMP_WORDS[0]}" in
-    git)
-        local cmd="${COMP_WORDS[2]}"
-        mycword="$((mycword-1))"
-        ;;
-    git-bundle*)
-        local cmd="${COMP_WORDS[1]}"
-        ;;
-    esac
-    case "$mycword" in
-    1)
-        __gitcomp "create list-heads verify unbundle"
-        ;;
-    2)
-        # looking for a file
-        ;;
-    *)
-        case "$cmd" in
-            create)
-                __git_complete_revlist
-            ;;
-        esac
-        ;;
-    esac
+	local cmd="${words[2]}"
+	case "$cword" in
+	2)
+		__gitcomp "create list-heads verify unbundle"
+		;;
+	3)
+		# looking for a file
+		;;
+	*)
+		case "$cmd" in
+			create)
+				__git_complete_revlist
+			;;
+		esac
+		;;
+	esac
 }
 
 _git_checkout ()
 {
-    __gitcomp "$(__git_refs)"
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin checkout
+		;;
+	*)
+		# check if --track, --no-track, or --no-guess was specified
+		# if so, disable DWIM mode
+		local flags="--track --no-track --no-guess" track_opt="--track"
+		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
+			track_opt=''
+		fi
+		__git_complete_refs $track_opt
+		;;
+	esac
+}
+
+__git_cherry_pick_inprogress_options="--continue --quit --abort"
+
+_git_cherry_pick ()
+{
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
+		__gitcomp "$__git_cherry_pick_inprogress_options"
+		return
+	fi
+
+	__git_complete_strategy && return
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
+		;;
+	*)
+		__git_complete_refs
+		;;
+	esac
 }
 
-_git_cherry ()
+_git_clean ()
 {
-    __gitcomp "$(__git_refs)"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin clean
+		return
+		;;
+	esac
+
+	# XXX should we check for -x option ?
+	__git_complete_index_file "--others --directory"
 }
 
-_git_cherry_pick ()
+_git_clone ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--edit --no-commit"
-        ;;
-    *)
-        __gitcomp "$(__git_refs)"
-        ;;
-    esac
+	case "$cur" in
+	--*)
+		__gitcomp_builtin clone
+		return
+		;;
+	esac
 }
 
+__git_untracked_file_modes="all no normal"
+
 _git_commit ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "
-            --all --author= --signoff --verify --no-verify
-            --edit --amend --include --only
-            "
-        return
-    esac
-    COMPREPLY=()
+	case "$prev" in
+	-c|-C)
+		__git_complete_refs
+		return
+		;;
+	esac
+
+	case "$cur" in
+	--cleanup=*)
+		__gitcomp "default scissors strip verbatim whitespace
+			" "" "${cur##--cleanup=}"
+		return
+		;;
+	--reuse-message=*|--reedit-message=*|\
+	--fixup=*|--squash=*)
+		__git_complete_refs --cur="${cur#*=}"
+		return
+		;;
+	--untracked-files=*)
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin commit
+		return
+	esac
+
+	if __git rev-parse --verify --quiet HEAD >/dev/null; then
+		__git_complete_index_file "--committable"
+	else
+		# This is the first commit
+		__git_complete_index_file "--cached"
+	fi
 }
 
 _git_describe ()
 {
-    __gitcomp "$(__git_refs)"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin describe
+		return
+	esac
+	__git_complete_refs
 }
 
+__git_diff_algorithms="myers minimal patience histogram"
+
+__git_diff_submodule_formats="diff log short"
+
+__git_diff_common_options="--stat --numstat --shortstat --summary
+			--patch-with-stat --name-only --name-status --color
+			--no-color --color-words --no-renames --check
+			--full-index --binary --abbrev --diff-filter=
+			--find-copies-harder --ignore-cr-at-eol
+			--text --ignore-space-at-eol --ignore-space-change
+			--ignore-all-space --ignore-blank-lines --exit-code
+			--quiet --ext-diff --no-ext-diff
+			--no-prefix --src-prefix= --dst-prefix=
+			--inter-hunk-context=
+			--patience --histogram --minimal
+			--raw --word-diff --word-diff-regex=
+			--dirstat --dirstat= --dirstat-by-file
+			--dirstat-by-file= --cumulative
+			--diff-algorithm=
+			--submodule --submodule= --ignore-submodules
+"
+
 _git_diff ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--cached --stat --numstat --shortstat --summary
-            --patch-with-stat --name-only --name-status --color
-            --no-color --color-words --no-renames --check
-            --full-index --binary --abbrev --diff-filter
-            --find-copies-harder --pickaxe-all --pickaxe-regex
-            --text --ignore-space-at-eol --ignore-space-change
-            --ignore-all-space --exit-code --quiet --ext-diff
-            --no-ext-diff"
-        return
-        ;;
-    esac
-    __git_complete_file
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
+	--*)
+		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs --no-index
+			$__git_diff_common_options
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist_file
 }
 
-_git_diff_tree ()
+__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
+			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
+			codecompare smerge
+"
+
+_git_difftool ()
 {
-    __gitcomp "$(__git_refs)"
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--tool=*)
+		__gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin difftool "$__git_diff_common_options
+					--base --cached --ours --theirs
+					--pickaxe-all --pickaxe-regex
+					--relative --staged
+					"
+		return
+		;;
+	esac
+	__git_complete_revlist_file
 }
 
+__git_fetch_recurse_submodules="yes on-demand no"
+
 _git_fetch ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-
-    case "${COMP_WORDS[0]},$COMP_CWORD" in
-    git-fetch*,1)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    git,2)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    *)
-        case "$cur" in
-        *:*)
-            __gitcomp "$(__git_refs)" "" "${cur#*:}"
-            ;;
-        *)
-            local remote
-            case "${COMP_WORDS[0]}" in
-            git-fetch) remote="${COMP_WORDS[1]}" ;;
-            git)       remote="${COMP_WORDS[2]}" ;;
-            esac
-            __gitcomp "$(__git_refs2 "$remote")"
-            ;;
-        esac
-        ;;
-    esac
+	case "$cur" in
+	--recurse-submodules=*)
+		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
+		return
+		;;
+	--filter=*)
+		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin fetch
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
 }
 
+__git_format_patch_extra_options="
+	--full-index --not --all --no-prefix --src-prefix=
+	--dst-prefix= --notes
+"
+
 _git_format_patch ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "
-            --stdout --attach --thread
-            --output-directory
-            --numbered --start-number
-            --numbered-files
-            --keep-subject
-            --signoff
-            --in-reply-to=
-            --full-index --binary
-            --not --all
-            "
-        return
-        ;;
-    esac
-    __git_complete_revlist
-}
-
-_git_gc ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--prune --aggressive"
-        return
-        ;;
-    esac
-    COMPREPLY=()
+	case "$cur" in
+	--thread=*)
+		__gitcomp "
+			deep shallow
+			" "" "${cur##--thread=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+_git_fsck ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_builtin fsck
+		return
+		;;
+	esac
+}
+
+_git_gitk ()
+{
+	_gitk
+}
+
+# Lists matching symbol names from a tag (as in ctags) file.
+# 1: List symbol names matching this word.
+# 2: The tag file to list symbol names from.
+# 3: A prefix to be added to each listed symbol name (optional).
+# 4: A suffix to be appended to each listed symbol name (optional).
+__git_match_ctag () {
+	awk -v pfx="${3-}" -v sfx="${4-}" "
+		/^${1//\//\\/}/ { print pfx \$1 sfx }
+		" "$2"
+}
+
+# Complete symbol names from a tag file.
+# Usage: __git_complete_symbol [<option>]...
+# --tags=<file>: The tag file to list symbol names from instead of the
+#                default "tags".
+# --pfx=<prefix>: A prefix to be added to each symbol name.
+# --cur=<word>: The current symbol name to be completed.  Defaults to
+#               the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each symbol name instead
+#                 of the default space.
+__git_complete_symbol () {
+	local tags=tags pfx="" cur_="${cur-}" sfx=" "
+
+	while test $# != 0; do
+		case "$1" in
+		--tags=*)	tags="${1##--tags=}" ;;
+		--pfx=*)	pfx="${1##--pfx=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	if test -r "$tags"; then
+		__gitcomp_direct "$(__git_match_ctag "$cur_" "$tags" "$pfx" "$sfx")"
+	fi
+}
+
+_git_grep ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin grep
+		return
+		;;
+	esac
+
+	case "$cword,$prev" in
+	2,*|*,-*)
+		__git_complete_symbol && return
+		;;
+	esac
+
+	__git_complete_refs
+}
+
+_git_help ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_builtin help
+		return
+		;;
+	esac
+	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	then
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
+	else
+		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+	fi
+}
+
+_git_init ()
+{
+	case "$cur" in
+	--shared=*)
+		__gitcomp "
+			false true umask group all world everybody
+			" "" "${cur##--shared=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin init
+		return
+		;;
+	esac
+}
+
+_git_ls_files ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-files
+		return
+		;;
+	esac
+
+	# XXX ignore options like --modified and always suggest all cached
+	# files.
+	__git_complete_index_file "--cached"
 }
 
 _git_ls_remote ()
 {
-    __gitcomp "$(__git_remotes)"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-remote
+		return
+		;;
+	esac
+	__gitcomp_nl "$(__git_remotes)"
 }
 
 _git_ls_tree ()
 {
-    __git_complete_file
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
+	__git_complete_file
 }
 
+# Options that go well for log, shortlog and gitk
+__git_log_common_options="
+	--not --all
+	--branches --tags --remotes
+	--first-parent --merges --no-merges
+	--max-count=
+	--max-age= --since= --after=
+	--min-age= --until= --before=
+	--min-parents= --max-parents=
+	--no-min-parents --no-max-parents
+"
+# Options that go well for log and gitk (not shortlog)
+__git_log_gitk_options="
+	--dense --sparse --full-history
+	--simplify-merges --simplify-by-decoration
+	--left-right --notes --no-notes
+"
+# Options that go well for log and shortlog (not gitk)
+__git_log_shortlog_options="
+	--author= --committer= --grep=
+	--all-match --invert-grep
+"
+
+__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
+
 _git_log ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --pretty=*)
-        __gitcomp "
-            oneline short medium full fuller email raw
-            " "" "${cur##--pretty=}"
-        return
-        ;;
-    --date=*)
-        __gitcomp "
-            relative iso8601 rfc2822 short local default
-        " "" "${cur##--date=}"
-        return
-        ;;
-    --*)
-        __gitcomp "
-            --max-count= --max-age= --since= --after=
-            --min-age= --before= --until=
-            --root --topo-order --date-order --reverse
-            --no-merges --follow
-            --abbrev-commit --abbrev=
-            --relative-date --date=
-            --author= --committer= --grep=
-            --all-match
-            --pretty= --name-status --name-only --raw
-            --not --all
-            --left-right --cherry-pick
-            "
-        return
-        ;;
-    esac
-    __git_complete_revlist
+	__git_has_doubledash && return
+	__git_find_repo_path
+
+	local merge=""
+	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
+		merge="--merge"
+	fi
+	case "$prev,$cur" in
+	-L,:*:*)
+		return	# fall back to Bash filename completion
+		;;
+	-L,:*)
+		__git_complete_symbol --cur="${cur#:}" --sfx=":"
+		return
+		;;
+	-G,*|-S,*)
+		__git_complete_symbol
+		return
+		;;
+	esac
+	case "$cur" in
+	--pretty=*|--format=*)
+		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
+			" "" "${cur#*=}"
+		return
+		;;
+	--date=*)
+		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
+		return
+		;;
+	--decorate=*)
+		__gitcomp "full short no" "" "${cur##--decorate=}"
+		return
+		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_shortlog_options
+			$__git_log_gitk_options
+			--root --topo-order --date-order --reverse
+			--follow --full-diff
+			--abbrev-commit --abbrev=
+			--relative-date --date=
+			--pretty= --format= --oneline
+			--show-signature
+			--cherry-mark
+			--cherry-pick
+			--graph
+			--decorate --decorate=
+			--walk-reflogs
+			--parents --children
+			$merge
+			$__git_diff_common_options
+			--pickaxe-all --pickaxe-regex
+			"
+		return
+		;;
+	-L:*:*)
+		return	# fall back to Bash filename completion
+		;;
+	-L:*)
+		__git_complete_symbol --cur="${cur#-L:}" --sfx=":"
+		return
+		;;
+	-G*)
+		__git_complete_symbol --pfx="-G" --cur="${cur#-G}"
+		return
+		;;
+	-S*)
+		__git_complete_symbol --pfx="-S" --cur="${cur#-S}"
+		return
+		;;
+	esac
+	__git_complete_revlist
 }
 
 _git_merge ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "${COMP_WORDS[COMP_CWORD-1]}" in
-    -s|--strategy)
-        __gitcomp "$(__git_merge_strategies)"
-        return
-    esac
-    case "$cur" in
-    --strategy=*)
-        __gitcomp "$(__git_merge_strategies)" "" "${cur##--strategy=}"
-        return
-        ;;
-    --*)
-        __gitcomp "
-            --no-commit --no-summary --squash --strategy
-            "
-        return
-    esac
-    __gitcomp "$(__git_refs)"
+	__git_complete_strategy && return
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin merge
+		return
+	esac
+	__git_complete_refs
+}
+
+_git_mergetool ()
+{
+	case "$cur" in
+	--tool=*)
+		__gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}"
+		return
+		;;
+	--*)
+		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
+		return
+		;;
+	esac
 }
 
 _git_merge_base ()
 {
-    __gitcomp "$(__git_refs)"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin merge-base
+		return
+		;;
+	esac
+	__git_complete_refs
 }
 
-_git_name_rev ()
+_git_mv ()
 {
-    __gitcomp "--tags --all --stdin"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin mv
+		return
+		;;
+	esac
+
+	if [ $(__git_count_arguments "mv") -gt 0 ]; then
+		# We need to show both cached and untracked files (including
+		# empty directories) since this may not be the last argument.
+		__git_complete_index_file "--cached --others --directory"
+	else
+		__git_complete_index_file "--cached"
+	fi
+}
+
+_git_notes ()
+{
+	local subcommands='add append copy edit get-ref list merge prune remove show'
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+
+	case "$subcommand,$cur" in
+	,--*)
+		__gitcomp_builtin notes
+		;;
+	,*)
+		case "$prev" in
+		--ref)
+			__git_complete_refs
+			;;
+		*)
+			__gitcomp "$subcommands --ref"
+			;;
+		esac
+		;;
+	*,--reuse-message=*|*,--reedit-message=*)
+		__git_complete_refs --cur="${cur#*=}"
+		;;
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
+		;;
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
+		;;
+	*)
+		case "$prev" in
+		-m|-F)
+			;;
+		*)
+			__git_complete_refs
+			;;
+		esac
+		;;
+	esac
 }
 
 _git_pull ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-
-    case "${COMP_WORDS[0]},$COMP_CWORD" in
-    git-pull*,1)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    git,2)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    *)
-        local remote
-        case "${COMP_WORDS[0]}" in
-        git-pull)  remote="${COMP_WORDS[1]}" ;;
-        git)       remote="${COMP_WORDS[2]}" ;;
-        esac
-        __gitcomp "$(__git_refs "$remote")"
-        ;;
-    esac
+	__git_complete_strategy && return
+
+	case "$cur" in
+	--recurse-submodules=*)
+		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin pull
+
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+__git_push_recurse_submodules="check on-demand only"
+
+__git_complete_force_with_lease ()
+{
+	local cur_=$1
+
+	case "$cur_" in
+	--*=)
+		;;
+	*:*)
+		__git_complete_refs --cur="${cur_#*:}"
+		;;
+	*)
+		__git_complete_refs --cur="$cur_"
+		;;
+	esac
 }
 
 _git_push ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-
-    case "${COMP_WORDS[0]},$COMP_CWORD" in
-    git-push*,1)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    git,2)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    *)
-        case "$cur" in
-        *:*)
-            local remote
-            case "${COMP_WORDS[0]}" in
-            git-push)  remote="${COMP_WORDS[1]}" ;;
-            git)       remote="${COMP_WORDS[2]}" ;;
-            esac
-            __gitcomp "$(__git_refs "$remote")" "" "${cur#*:}"
-            ;;
-        +*)
-            __gitcomp "$(__git_refs)" + "${cur#+}"
-            ;;
-        *)
-            __gitcomp "$(__git_refs)"
-            ;;
-        esac
-        ;;
-    esac
+	case "$prev" in
+	--repo)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
+	--recurse-submodules)
+		__gitcomp "$__git_push_recurse_submodules"
+		return
+		;;
+	esac
+	case "$cur" in
+	--repo=*)
+		__gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
+		return
+		;;
+	--recurse-submodules=*)
+		__gitcomp "$__git_push_recurse_submodules" "" "${cur##--recurse-submodules=}"
+		return
+		;;
+	--force-with-lease=*)
+		__git_complete_force_with_lease "${cur##--force-with-lease=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin push
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_range_diff ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--creation-factor= --no-dual-color
+			$__git_diff_common_options
+		"
+		return
+		;;
+	esac
+	__git_complete_revlist
 }
 
 _git_rebase ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then
-        __gitcomp "--continue --skip --abort"
-        return
-    fi
-    case "${COMP_WORDS[COMP_CWORD-1]}" in
-    -s|--strategy)
-        __gitcomp "$(__git_merge_strategies)"
-        return
-    esac
-    case "$cur" in
-    --strategy=*)
-        __gitcomp "$(__git_merge_strategies)" "" "${cur##--strategy=}"
-        return
-        ;;
-    --*)
-        __gitcomp "--onto --merge --strategy"
-        return
-    esac
-    __gitcomp "$(__git_refs)"
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
+		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
+		return
+	elif [ -d "$__git_repo_path"/rebase-apply ] || \
+	     [ -d "$__git_repo_path"/rebase-merge ]; then
+		__gitcomp "--continue --skip --abort --quit --show-current-patch"
+		return
+	fi
+	__git_complete_strategy && return
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--onto --merge --strategy --interactive
+			--rebase-merges --preserve-merges --stat --no-stat
+			--committer-date-is-author-date --ignore-date
+			--ignore-whitespace --whitespace=
+			--autosquash --no-autosquash
+			--fork-point --no-fork-point
+			--autostash --no-autostash
+			--verify --no-verify
+			--keep-empty --root --force-rebase --no-ff
+			--rerere-autoupdate
+			--exec
+			"
+
+		return
+	esac
+	__git_complete_refs
+}
+
+_git_reflog ()
+{
+	local subcommands="show delete expire"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		__git_complete_refs
+	fi
+}
+
+__git_send_email_confirm_options="always never auto cc compose"
+__git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
+
+_git_send_email ()
+{
+	case "$prev" in
+	--to|--cc|--bcc|--from)
+		__gitcomp "$(__git send-email --dump-aliases)"
+		return
+		;;
+	esac
+
+	case "$cur" in
+	--confirm=*)
+		__gitcomp "
+			$__git_send_email_confirm_options
+			" "" "${cur##--confirm=}"
+		return
+		;;
+	--suppress-cc=*)
+		__gitcomp "
+			$__git_send_email_suppresscc_options
+			" "" "${cur##--suppress-cc=}"
+
+		return
+		;;
+	--smtp-encryption=*)
+		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
+		return
+		;;
+	--thread=*)
+		__gitcomp "
+			deep shallow
+			" "" "${cur##--thread=}"
+		return
+		;;
+	--to=*|--cc=*|--bcc=*|--from=*)
+		__gitcomp "$(__git send-email --dump-aliases)" "" "${cur#--*=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
+			--compose --confirm= --dry-run --envelope-sender
+			--from --identity
+			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
+			--no-suppress-from --no-thread --quiet --reply-to
+			--signed-off-by-cc --smtp-pass --smtp-server
+			--smtp-server-port --smtp-encryption= --smtp-user
+			--subject --suppress-cc= --suppress-from --thread --to
+			--validate --no-validate
+			$__git_format_patch_extra_options"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+_git_stage ()
+{
+	_git_add
+}
+
+_git_status ()
+{
+	local complete_opt
+	local untracked_state
+
+	case "$cur" in
+	--ignore-submodules=*)
+		__gitcomp "none untracked dirty all" "" "${cur##--ignore-submodules=}"
+		return
+		;;
+	--untracked-files=*)
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
+		return
+		;;
+	--column=*)
+		__gitcomp "
+			always never auto column row plain dense nodense
+			" "" "${cur##--column=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin status
+		return
+		;;
+	esac
+
+	untracked_state="$(__git_get_option_value "-u" "--untracked-files=" \
+		"$__git_untracked_file_modes" "status.showUntrackedFiles")"
+
+	case "$untracked_state" in
+	no)
+		# --ignored option does not matter
+		complete_opt=
+		;;
+	all|normal|*)
+		complete_opt="--cached --directory --no-empty-directory --others"
+
+		if [ -n "$(__git_find_on_cmdline "--ignored")" ]; then
+			complete_opt="$complete_opt --ignored --exclude=*"
+		fi
+		;;
+	esac
+
+	__git_complete_index_file "$complete_opt"
+}
+
+__git_config_get_set_variables ()
+{
+	local prevword word config_file= c=$cword
+	while [ $c -gt 1 ]; do
+		word="${words[c]}"
+		case "$word" in
+		--system|--global|--local|--file=*)
+			config_file="$word"
+			break
+			;;
+		-f|--file)
+			config_file="$word $prevword"
+			break
+			;;
+		esac
+		prevword=$word
+		c=$((--c))
+	done
+
+	__git config $config_file --name-only --list
+}
+
+__git_config_vars=
+__git_compute_config_vars ()
+{
+	test -n "$__git_config_vars" ||
+	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
 }
 
 _git_config ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prv="${COMP_WORDS[COMP_CWORD-1]}"
-    case "$prv" in
-    branch.*.remote)
-        __gitcomp "$(__git_remotes)"
-        return
-        ;;
-    branch.*.merge)
-        __gitcomp "$(__git_refs)"
-        return
-        ;;
-    remote.*.fetch)
-        local remote="${prv#remote.}"
-        remote="${remote%.fetch}"
-        __gitcomp "$(__git_refs_remotes "$remote")"
-        return
-        ;;
-    remote.*.push)
-        local remote="${prv#remote.}"
-        remote="${remote%.push}"
-        __gitcomp "$(git --git-dir="$(__gitdir)" \
-            for-each-ref --format='%(refname):%(refname)' \
-            refs/heads)"
-        return
-        ;;
-    pull.twohead|pull.octopus)
-        __gitcomp "$(__git_merge_strategies)"
-        return
-        ;;
-    color.branch|color.diff|color.status)
-        __gitcomp "always never auto"
-        return
-        ;;
-    color.*.*)
-        __gitcomp "
-            black red green yellow blue magenta cyan white
-            bold dim ul blink reverse
-            "
-        return
-        ;;
-    *.*)
-        COMPREPLY=()
-        return
-        ;;
-    esac
-    case "$cur" in
-    --*)
-        __gitcomp "
-            --global --system --file=
-            --list --replace-all
-            --get --get-all --get-regexp
-            --add --unset --unset-all
-            --remove-section --rename-section
-            "
-        return
-        ;;
-    branch.*.*)
-        local pfx="${cur%.*}."
-        cur="${cur##*.}"
-        __gitcomp "remote merge" "$pfx" "$cur"
-        return
-        ;;
-    branch.*)
-        local pfx="${cur%.*}."
-        cur="${cur#*.}"
-        __gitcomp "$(__git_heads)" "$pfx" "$cur" "."
-        return
-        ;;
-    remote.*.*)
-        local pfx="${cur%.*}."
-        cur="${cur##*.}"
-        __gitcomp "
-            url fetch push skipDefaultUpdate
-            receivepack uploadpack tagopt
-            " "$pfx" "$cur"
-        return
-        ;;
-    remote.*)
-        local pfx="${cur%.*}."
-        cur="${cur#*.}"
-        __gitcomp "$(__git_remotes)" "$pfx" "$cur" "."
-        return
-        ;;
-    esac
-    __gitcomp "
-        apply.whitespace
-        core.fileMode
-        core.gitProxy
-        core.ignoreStat
-        core.preferSymlinkRefs
-        core.logAllRefUpdates
-        core.loosecompression
-        core.repositoryFormatVersion
-        core.sharedRepository
-        core.warnAmbiguousRefs
-        core.compression
-        core.legacyHeaders
-        core.packedGitWindowSize
-        core.packedGitLimit
-        clean.requireForce
-        color.branch
-        color.branch.current
-        color.branch.local
-        color.branch.remote
-        color.branch.plain
-        color.diff
-        color.diff.plain
-        color.diff.meta
-        color.diff.frag
-        color.diff.old
-        color.diff.new
-        color.diff.commit
-        color.diff.whitespace
-        color.pager
-        color.status
-        color.status.header
-        color.status.added
-        color.status.changed
-        color.status.untracked
-        diff.renameLimit
-        diff.renames
-        fetch.unpackLimit
-        format.headers
-        format.subjectprefix
-        gitcvs.enabled
-        gitcvs.logfile
-        gitcvs.allbinary
-        gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dvpass
-        gc.packrefs
-        gc.reflogexpire
-        gc.reflogexpireunreachable
-        gc.rerereresolved
-        gc.rerereunresolved
-        http.sslVerify
-        http.sslCert
-        http.sslKey
-        http.sslCAInfo
-        http.sslCAPath
-        http.maxRequests
-        http.lowSpeedLimit
-        http.lowSpeedTime
-        http.noEPSV
-        i18n.commitEncoding
-        i18n.logOutputEncoding
-        log.showroot
-        merge.tool
-        merge.summary
-        merge.verbosity
-        pack.window
-        pack.depth
-        pack.windowMemory
-        pack.compression
-        pack.deltaCacheSize
-        pack.deltaCacheLimit
-        pull.octopus
-        pull.twohead
-        repack.useDeltaBaseOffset
-        show.difftree
-        showbranch.default
-        tar.umask
-        transfer.unpackLimit
-        receive.unpackLimit
-        receive.denyNonFastForwards
-        user.name
-        user.email
-        user.signingkey
-        whatchanged.difftree
-        branch. remote.
-    "
+	local varname
+
+	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
+		varname="${prev,,}"
+	else
+		varname="$(echo "$prev" |tr A-Z a-z)"
+	fi
+
+	case "$varname" in
+	branch.*.remote|branch.*.pushremote)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
+	branch.*.merge)
+		__git_complete_refs
+		return
+		;;
+	branch.*.rebase)
+		__gitcomp "false true merges preserve interactive"
+		return
+		;;
+	remote.pushdefault)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
+	remote.*.fetch)
+		local remote="${prev#remote.}"
+		remote="${remote%.fetch}"
+		if [ -z "$cur" ]; then
+			__gitcomp_nl "refs/heads/" "" "" ""
+			return
+		fi
+		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		return
+		;;
+	remote.*.push)
+		local remote="${prev#remote.}"
+		remote="${remote%.push}"
+		__gitcomp_nl "$(__git for-each-ref \
+			--format='%(refname):%(refname)' refs/heads)"
+		return
+		;;
+	pull.twohead|pull.octopus)
+		__git_compute_merge_strategies
+		__gitcomp "$__git_merge_strategies"
+		return
+		;;
+	color.branch|color.diff|color.interactive|\
+	color.showbranch|color.status|color.ui)
+		__gitcomp "always never auto"
+		return
+		;;
+	color.pager)
+		__gitcomp "false true"
+		return
+		;;
+	color.*.*)
+		__gitcomp "
+			normal black red green yellow blue magenta cyan white
+			bold dim ul blink reverse
+			"
+		return
+		;;
+	diff.submodule)
+		__gitcomp "$__git_diff_submodule_formats"
+		return
+		;;
+	help.format)
+		__gitcomp "man info web html"
+		return
+		;;
+	log.date)
+		__gitcomp "$__git_log_date_formats"
+		return
+		;;
+	sendemail.aliasfiletype)
+		__gitcomp "mutt mailrc pine elm gnus"
+		return
+		;;
+	sendemail.confirm)
+		__gitcomp "$__git_send_email_confirm_options"
+		return
+		;;
+	sendemail.suppresscc)
+		__gitcomp "$__git_send_email_suppresscc_options"
+		return
+		;;
+	sendemail.transferencoding)
+		__gitcomp "7bit 8bit quoted-printable base64"
+		return
+		;;
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		return
+		;;
+	esac
+	case "$cur" in
+	--*)
+		__gitcomp_builtin config
+		return
+		;;
+	branch.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+		return
+		;;
+	branch.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+		return
+		;;
+	guitool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "
+			argPrompt cmd confirm needsFile noConsole noRescan
+			prompt revPrompt revUnmerged title
+			" "$pfx" "$cur_"
+		return
+		;;
+	difftool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_"
+		return
+		;;
+	man.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_"
+		return
+		;;
+	mergetool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		return
+		;;
+	pager.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__git_compute_all_commands
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		return
+		;;
+	remote.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "
+			url proxy fetch push mirror skipDefaultUpdate
+			receivepack uploadpack tagOpt pushurl
+			" "$pfx" "$cur_"
+		return
+		;;
+	remote.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+		return
+		;;
+	url.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		return
+		;;
+	*.*)
+		__git_compute_config_vars
+		__gitcomp "$__git_config_vars"
+		;;
+	*)
+		__git_compute_config_vars
+		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
+	esac
 }
 
 _git_remote ()
 {
-    local i c=1 command
-    while [ $c -lt $COMP_CWORD ]; do
-        i="${COMP_WORDS[c]}"
-        case "$i" in
-        add|rm|show|prune|update) command="$i"; break ;;
-        esac
-        c=$((++c))
-    done
-
-    if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
-        __gitcomp "add rm show prune update"
-        return
-    fi
-
-    case "$command" in
-    rm|show|prune)
-        __gitcomp "$(__git_remotes)"
-        ;;
-    update)
-        local i c='' IFS=$'\n'
-        for i in $(git --git-dir="$(__gitdir)" config --list); do
-            case "$i" in
-            remotes.*)
-                i="${i#remotes.}"
-                c="$c ${i/=*/}"
-                ;;
-            esac
-        done
-        __gitcomp "$c"
-        ;;
-    *)
-        COMPREPLY=()
-        ;;
-    esac
+	local subcommands="
+		add rename remove set-head set-branches
+		get-url set-url show prune update
+		"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		case "$cur" in
+		--*)
+			__gitcomp_builtin remote
+			;;
+		*)
+			__gitcomp "$subcommands"
+			;;
+		esac
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	add,--*)
+		__gitcomp_builtin remote_add
+		;;
+	add,*)
+		;;
+	set-head,--*)
+		__gitcomp_builtin remote_set-head
+		;;
+	set-branches,--*)
+		__gitcomp_builtin remote_set-branches
+		;;
+	set-head,*|set-branches,*)
+		__git_complete_remote_or_refspec
+		;;
+	update,--*)
+		__gitcomp_builtin remote_update
+		;;
+	update,*)
+		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
+		;;
+	set-url,--*)
+		__gitcomp_builtin remote_set-url
+		;;
+	get-url,--*)
+		__gitcomp_builtin remote_get-url
+		;;
+	prune,--*)
+		__gitcomp_builtin remote_prune
+		;;
+	*)
+		__gitcomp_nl "$(__git_remotes)"
+		;;
+	esac
+}
+
+_git_replace ()
+{
+	case "$cur" in
+	--format=*)
+		__gitcomp "short medium long" "" "${cur##--format=}"
+		return
+		;;
+	--*)
+		__gitcomp_builtin replace
+		return
+		;;
+	esac
+	__git_complete_refs
+}
+
+_git_rerere ()
+{
+	local subcommands="clear forget diff remaining status gc"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if test -z "$subcommand"
+	then
+		__gitcomp "$subcommands"
+		return
+	fi
 }
 
 _git_reset ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--mixed --hard --soft"
-        return
-        ;;
-    esac
-    __gitcomp "$(__git_refs)"
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin reset
+		return
+		;;
+	esac
+	__git_complete_refs
+}
+
+__git_revert_inprogress_options="--continue --quit --abort"
+
+_git_revert ()
+{
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
+		__gitcomp "$__git_revert_inprogress_options"
+		return
+	fi
+	__git_complete_strategy && return
+	case "$cur" in
+	--*)
+		__gitcomp_builtin revert "" \
+			"$__git_revert_inprogress_options"
+		return
+		;;
+	esac
+	__git_complete_refs
+}
+
+_git_rm ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_builtin rm
+		return
+		;;
+	esac
+
+	__git_complete_index_file "--cached"
 }
 
 _git_shortlog ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "
-            --max-count= --max-age= --since= --after=
-            --min-age= --before= --until=
-            --no-merges
-            --author= --committer= --grep=
-            --all-match
-            --not --all
-            --numbered --summary
-            "
-        return
-        ;;
-    esac
-    __git_complete_revlist
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_shortlog_options
+			--numbered --summary --email
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
 }
 
 _git_show ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --pretty=*)
-        __gitcomp "
-            oneline short medium full fuller email raw
-            " "" "${cur##--pretty=}"
-        return
-        ;;
-    --*)
-        __gitcomp "--pretty="
-        return
-        ;;
-    esac
-    __git_complete_file
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--pretty=*|--format=*)
+		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
+			" "" "${cur#*=}"
+		return
+		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
+	--*)
+		__gitcomp "--pretty= --format= --abbrev-commit --oneline
+			--show-signature
+			$__git_diff_common_options
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist_file
+}
+
+_git_show_branch ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_builtin show-branch
+		return
+		;;
+	esac
+	__git_complete_revlist
 }
 
 _git_stash ()
 {
-    __gitcomp 'list show apply clear pop'
+	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
+	local subcommands='push list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
+		subcommand="push"
+	fi
+	if [ -z "$subcommand" ]; then
+		case "$cur" in
+		--*)
+			__gitcomp "$save_opts"
+			;;
+		sa*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "save"
+			fi
+			;;
+		*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "$subcommands"
+			fi
+			;;
+		esac
+	else
+		case "$subcommand,$cur" in
+		push,--*)
+			__gitcomp "$save_opts --message"
+			;;
+		save,--*)
+			__gitcomp "$save_opts"
+			;;
+		apply,--*|pop,--*)
+			__gitcomp "--index --quiet"
+			;;
+		drop,--*)
+			__gitcomp "--quiet"
+			;;
+		list,--*)
+			__gitcomp "--name-status --oneline --patch-with-stat"
+			;;
+		show,--*|branch,--*)
+			;;
+		branch,*)
+			if [ $cword -eq 3 ]; then
+				__git_complete_refs
+			else
+				__gitcomp_nl "$(__git stash list \
+						| sed -n -e 's/:.*//p')"
+			fi
+			;;
+		show,*|apply,*|drop,*|pop,*)
+			__gitcomp_nl "$(__git stash list \
+					| sed -n -e 's/:.*//p')"
+			;;
+		*)
+			;;
+		esac
+	fi
 }
 
 _git_submodule ()
 {
-    local i c=1 command
-    while [ $c -lt $COMP_CWORD ]; do
-        i="${COMP_WORDS[c]}"
-        case "$i" in
-        add|status|init|update) command="$i"; break ;;
-        esac
-        c=$((++c))
-    done
-
-    if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
-        local cur="${COMP_WORDS[COMP_CWORD]}"
-        case "$cur" in
-        --*)
-            __gitcomp "--quiet --cached"
-            ;;
-        *)
-            __gitcomp "add status init update"
-            ;;
-        esac
-        return
-    fi
+	__git_has_doubledash && return
+
+	local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		case "$cur" in
+		--*)
+			__gitcomp "--quiet"
+			;;
+		*)
+			__gitcomp "$subcommands"
+			;;
+		esac
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	add,--*)
+		__gitcomp "--branch --force --name --reference --depth"
+		;;
+	status,--*)
+		__gitcomp "--cached --recursive"
+		;;
+	deinit,--*)
+		__gitcomp "--force --all"
+		;;
+	update,--*)
+		__gitcomp "
+			--init --remote --no-fetch
+			--recommend-shallow --no-recommend-shallow
+			--force --rebase --merge --reference --depth --recursive --jobs
+		"
+		;;
+	set-branch,--*)
+		__gitcomp "--default --branch"
+		;;
+	summary,--*)
+		__gitcomp "--cached --files --summary-limit"
+		;;
+	foreach,--*|sync,--*)
+		__gitcomp "--recursive"
+		;;
+	*)
+		;;
+	esac
+}
+
+_git_svn ()
+{
+	local subcommands="
+		init fetch clone rebase dcommit log find-rev
+		set-tree commit-diff info create-ignore propget
+		proplist show-ignore show-externals branch tag blame
+		migrate mkdirs reset gc
+		"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		local remote_opts="--username= --config-dir= --no-auth-cache"
+		local fc_opts="
+			--follow-parent --authors-file= --repack=
+			--no-metadata --use-svm-props --use-svnsync-props
+			--log-window-size= --no-checkout --quiet
+			--repack-flags --use-log-author --localtime
+			--add-author-from
+			--ignore-paths= --include-paths= $remote_opts
+			"
+		local init_opts="
+			--template= --shared= --trunk= --tags=
+			--branches= --stdlayout --minimize-url
+			--no-metadata --use-svm-props --use-svnsync-props
+			--rewrite-root= --prefix= $remote_opts
+			"
+		local cmt_opts="
+			--edit --rmdir --find-copies-harder --copy-similarity=
+			"
+
+		case "$subcommand,$cur" in
+		fetch,--*)
+			__gitcomp "--revision= --fetch-all $fc_opts"
+			;;
+		clone,--*)
+			__gitcomp "--revision= $fc_opts $init_opts"
+			;;
+		init,--*)
+			__gitcomp "$init_opts"
+			;;
+		dcommit,--*)
+			__gitcomp "
+				--merge --strategy= --verbose --dry-run
+				--fetch-all --no-rebase --commit-url
+				--revision --interactive $cmt_opts $fc_opts
+				"
+			;;
+		set-tree,--*)
+			__gitcomp "--stdin $cmt_opts $fc_opts"
+			;;
+		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
+		show-externals,--*|mkdirs,--*)
+			__gitcomp "--revision="
+			;;
+		log,--*)
+			__gitcomp "
+				--limit= --revision= --verbose --incremental
+				--oneline --show-commit --non-recursive
+				--authors-file= --color
+				"
+			;;
+		rebase,--*)
+			__gitcomp "
+				--merge --verbose --strategy= --local
+				--fetch-all --dry-run $fc_opts
+				"
+			;;
+		commit-diff,--*)
+			__gitcomp "--message= --file= --revision= $cmt_opts"
+			;;
+		info,--*)
+			__gitcomp "--url"
+			;;
+		branch,--*)
+			__gitcomp "--dry-run --message --tag"
+			;;
+		tag,--*)
+			__gitcomp "--dry-run --message"
+			;;
+		blame,--*)
+			__gitcomp "--git-format"
+			;;
+		migrate,--*)
+			__gitcomp "
+				--config-dir= --ignore-paths= --minimize
+				--no-auth-cache --username=
+				"
+			;;
+		reset,--*)
+			__gitcomp "--revision= --parent"
+			;;
+		*)
+			;;
+		esac
+	fi
 }
 
 _git_tag ()
 {
-    local i c=1 f=0
-    while [ $c -lt $COMP_CWORD ]; do
-        i="${COMP_WORDS[c]}"
-        case "$i" in
-        -d|-v)
-            __gitcomp "$(__git_tags)"
-            return
-            ;;
-        -f)
-            f=1
-            ;;
-        esac
-        c=$((++c))
-    done
-
-    case "${COMP_WORDS[COMP_CWORD-1]}" in
-    -m|-F)
-        COMPREPLY=()
-        ;;
-    -*|tag|git-tag)
-        if [ $f = 1 ]; then
-            __gitcomp "$(__git_tags)"
-        else
-            COMPREPLY=()
-        fi
-        ;;
-    *)
-        __gitcomp "$(__git_refs)"
-        ;;
-    esac
+	local i c=1 f=0
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		-d|--delete|-v|--verify)
+			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
+			return
+			;;
+		-f)
+			f=1
+			;;
+		esac
+		((c++))
+	done
+
+	case "$prev" in
+	-m|-F)
+		;;
+	-*|tag)
+		if [ $f = 1 ]; then
+			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
+		fi
+		;;
+	*)
+		__git_complete_refs
+		;;
+	esac
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin tag
+		;;
+	esac
+}
+
+_git_whatchanged ()
+{
+	_git_log
+}
+
+_git_worktree ()
+{
+	local subcommands="add list lock move prune remove unlock"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		case "$subcommand,$cur" in
+		add,--*)
+			__gitcomp_builtin worktree_add
+			;;
+		list,--*)
+			__gitcomp_builtin worktree_list
+			;;
+		lock,--*)
+			__gitcomp_builtin worktree_lock
+			;;
+		prune,--*)
+			__gitcomp_builtin worktree_prune
+			;;
+		remove,--*)
+			__gitcomp "--force"
+			;;
+		*)
+			;;
+		esac
+	fi
 }
 
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
+		declare -f _completion_loader >/dev/null 2>/dev/null
+	then
+		_completion_loader "git-$command"
+	fi
+	if declare -f $completion_func >/dev/null 2>/dev/null
+	then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"
+	then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
+	fi
+}
+
+__git_main ()
+{
+	local i c=1 command __git_dir __git_repo_path
+	local __git_C_args C_args_count=0
+
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
+		--bare)      __git_dir="." ;;
+		--help) command="help"; break ;;
+		-c|--work-tree|--namespace) ((c++)) ;;
+		-C)	__git_C_args[C_args_count++]=-C
+			((c++))
+			__git_C_args[C_args_count++]="${words[c]}"
+			;;
+		-*) ;;
+		*) command="$i"; break ;;
+		esac
+		((c++))
+	done
+
+	if [ -z "$command" ]; then
+		case "$prev" in
+		--git-dir|-C|--work-tree)
+			# these need a path argument, let's fall back to
+			# Bash filename completion
+			return
+			;;
+		-c|--namespace)
+			# we don't support completing these options' arguments
+			return
+			;;
+		esac
+		case "$cur" in
+		--*)   __gitcomp "
+			--paginate
+			--no-pager
+			--git-dir=
+			--bare
+			--version
+			--exec-path
+			--exec-path=
+			--html-path
+			--man-path
+			--info-path
+			--work-tree=
+			--namespace=
+			--no-replace-objects
+			--help
+			"
+			;;
+		*)
+			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			then
+				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			else
+				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+			fi
+			;;
+		esac
+		return
+	fi
+
+	__git_complete_command "$command" && return
+
+	local expansion=$(__git_aliased_command "$command")
+	if [ -n "$expansion" ]; then
+		words[1]=$expansion
+		__git_complete_command "$expansion"
+	fi
+}
+
+__gitk_main ()
+{
+	__git_has_doubledash && return
+
+	local __git_repo_path
+	__git_find_repo_path
+
+	local merge=""
+	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
+		merge="--merge"
+	fi
+	case "$cur" in
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_gitk_options
+			$merge
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+if [[ -n ${ZSH_VERSION-} ]] &&
+   # Don't define these functions when sourced from 'git-completion.zsh',
+   # it has its own implementations.
+   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
+
+	autoload -U +X compinit && compinit
+
+	__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[${#array[@]}+1]="$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_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 ()
+	{
+		local _ret=1 cur cword prev
+		cur=${words[CURRENT]}
+		prev=${words[CURRENT-1]}
+		let cword=CURRENT-1
+		emulate ksh -c __${service}_main
+		let _ret && _default && _ret=0
+		return _ret
+	}
+
+	compdef _git git gitk
+	return
+fi
+
+__git_func_wrap ()
+{
+	local cur words cword prev
+	_get_comp_words_by_ref -n =: cur words cword prev
+	$1
+}
+
+# Setup completion for certain functions defined above by setting common
+# variables and workarounds.
+# This is NOT a public function; use at your own risk.
+__git_complete ()
+{
+	local wrapper="__git_wrap${2}"
+	eval "$wrapper () { __git_func_wrap $2 ; }"
+	complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \
+		|| complete -o default -o nospace -F $wrapper $1
+}
+
+# wrapper for backwards compatibility
 _git ()
 {
-    local i c=1 command __git_dir
-
-    while [ $c -lt $COMP_CWORD ]; do
-        i="${COMP_WORDS[c]}"
-        case "$i" in
-        --git-dir=*) __git_dir="${i#--git-dir=}" ;;
-        --bare)      __git_dir="." ;;
-        --version|--help|-p|--paginate) ;;
-        *) command="$i"; break ;;
-        esac
-        c=$((++c))
-    done
-
-    if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
-        case "${COMP_WORDS[COMP_CWORD]}" in
-        --*=*) COMPREPLY=() ;;
-        --*)   __gitcomp "
-            --no-pager
-            --git-dir=
-            --bare
-            --version
-            --exec-path
-            "
-            ;;
-        *)     __gitcomp "$(__git_commands) $(__git_aliases)" ;;
-        esac
-        return
-    fi
-
-    local expansion=$(__git_aliased_command "$command")
-    [ "$expansion" ] && command="$expansion"
-
-    case "$command" in
-    am)          _git_am ;;
-    add)         _git_add ;;
-    apply)       _git_apply ;;
-    bisect)      _git_bisect ;;
-    bundle)      _git_bundle ;;
-    branch)      _git_branch ;;
-    checkout)    _git_checkout ;;
-    cherry)      _git_cherry ;;
-    cherry-pick) _git_cherry_pick ;;
-    commit)      _git_commit ;;
-    config)      _git_config ;;
-    describe)    _git_describe ;;
-    diff)        _git_diff ;;
-    fetch)       _git_fetch ;;
-    format-patch) _git_format_patch ;;
-    gc)          _git_gc ;;
-    log)         _git_log ;;
-    ls-remote)   _git_ls_remote ;;
-    ls-tree)     _git_ls_tree ;;
-    merge)       _git_merge;;
-    merge-base)  _git_merge_base ;;
-    name-rev)    _git_name_rev ;;
-    pull)        _git_pull ;;
-    push)        _git_push ;;
-    rebase)      _git_rebase ;;
-    remote)      _git_remote ;;
-    reset)       _git_reset ;;
-    shortlog)    _git_shortlog ;;
-    show)        _git_show ;;
-    show-branch) _git_log ;;
-    stash)       _git_stash ;;
-    submodule)   _git_submodule ;;
-    tag)         _git_tag ;;
-    whatchanged) _git_log ;;
-    *)           COMPREPLY=() ;;
-    esac
+	__git_wrap__git_main
 }
 
+# wrapper for backwards compatibility
 _gitk ()
 {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __gitcomp "--not --all"
-        return
-        ;;
-    esac
-    __git_complete_revlist
-}
-
-complete -o default -o nospace -F _git git
-complete -o default -o nospace -F _gitk gitk
-complete -o default -o nospace -F _git_am git-am
-complete -o default -o nospace -F _git_apply git-apply
-complete -o default -o nospace -F _git_bisect git-bisect
-complete -o default -o nospace -F _git_branch git-branch
-complete -o default -o nospace -F _git_bundle git-bundle
-complete -o default -o nospace -F _git_checkout git-checkout
-complete -o default -o nospace -F _git_cherry git-cherry
-complete -o default -o nospace -F _git_cherry_pick git-cherry-pick
-complete -o default -o nospace -F _git_commit git-commit
-complete -o default -o nospace -F _git_describe git-describe
-complete -o default -o nospace -F _git_diff git-diff
-complete -o default -o nospace -F _git_fetch git-fetch
-complete -o default -o nospace -F _git_format_patch git-format-patch
-complete -o default -o nospace -F _git_gc git-gc
-complete -o default -o nospace -F _git_log git-log
-complete -o default -o nospace -F _git_ls_remote git-ls-remote
-complete -o default -o nospace -F _git_ls_tree git-ls-tree
-complete -o default -o nospace -F _git_merge git-merge
-complete -o default -o nospace -F _git_merge_base git-merge-base
-complete -o default -o nospace -F _git_name_rev git-name-rev
-complete -o default -o nospace -F _git_pull git-pull
-complete -o default -o nospace -F _git_push git-push
-complete -o default -o nospace -F _git_rebase git-rebase
-complete -o default -o nospace -F _git_config git-config
-complete -o default -o nospace -F _git_remote git-remote
-complete -o default -o nospace -F _git_reset git-reset
-complete -o default -o nospace -F _git_shortlog git-shortlog
-complete -o default -o nospace -F _git_show git-show
-complete -o default -o nospace -F _git_stash git-stash
-complete -o default -o nospace -F _git_submodule git-submodule
-complete -o default -o nospace -F _git_log git-show-branch
-complete -o default -o nospace -F _git_tag git-tag
-complete -o default -o nospace -F _git_log git-whatchanged
+	__git_wrap__gitk_main
+}
+
+__git_complete git __git_main
+__git_complete gitk __gitk_main
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
 if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-complete -o default -o nospace -F _git_add git-add.exe
-complete -o default -o nospace -F _git_apply git-apply.exe
-complete -o default -o nospace -F _git git.exe
-complete -o default -o nospace -F _git_branch git-branch.exe
-complete -o default -o nospace -F _git_bundle git-bundle.exe
-complete -o default -o nospace -F _git_cherry git-cherry.exe
-complete -o default -o nospace -F _git_describe git-describe.exe
-complete -o default -o nospace -F _git_diff git-diff.exe
-complete -o default -o nospace -F _git_format_patch git-format-patch.exe
-complete -o default -o nospace -F _git_log git-log.exe
-complete -o default -o nospace -F _git_ls_tree git-ls-tree.exe
-complete -o default -o nospace -F _git_merge_base git-merge-base.exe
-complete -o default -o nospace -F _git_name_rev git-name-rev.exe
-complete -o default -o nospace -F _git_push git-push.exe
-complete -o default -o nospace -F _git_config git-config
-complete -o default -o nospace -F _git_shortlog git-shortlog.exe
-complete -o default -o nospace -F _git_show git-show.exe
-complete -o default -o nospace -F _git_log git-show-branch.exe
-complete -o default -o nospace -F _git_tag git-tag.exe
-complete -o default -o nospace -F _git_log git-whatchanged.exe
+__git_complete git.exe __git_main
 fi
diff --git a/global.hgignore b/global.hgignore
deleted file mode 100644
index e3d9230..0000000
--- a/global.hgignore
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax: glob
-
-*.~
-*.swp
-
-# Ruby thingies
-.rbx/
-.rake_tasks
-
-# KDE
-build/
-.kdev4/
-*.kdev4
-.kdev_include_paths
-.directory
-*.kate-swp
-LLEGEIXME.txt
diff --git a/hgcompletion.sh b/hgcompletion.sh
deleted file mode 100644
index ce4cfaf..0000000
--- a/hgcompletion.sh
+++ /dev/null
@@ -1,587 +0,0 @@
-# bash completion for the Mercurial distributed SCM -*- sh -*-
-
-# Docs:
-#
-# If you source this file from your .bashrc, bash should be able to
-# complete a command line that uses hg with all the available commands
-# and options and sometimes even arguments.
-#
-# Mercurial allows you to define additional commands through extensions.
-# Bash should be able to automatically figure out the name of these new
-# commands and their options.  See below for how to define _hg_opt_foo
-# and _hg_cmd_foo functions to fine-tune the completion for option and
-# non-option arguments, respectively.
-#
-#
-# Notes about completion for specific commands:
-#
-# - the completion function for the email command from the patchbomb
-#   extension will try to call _hg_emails to get a list of e-mail
-#   addresses.  It's up to the user to define this function.  For
-#   example, put the addresses of the lists that you usually patchbomb
-#   in ~/.patchbomb-to and the addresses that you usually use to send
-#   the patchbombs in ~/.patchbomb-from and use something like this:
-#
-#      _hg_emails()
-#      {
-#          if [ -r ~/.patchbomb-$1 ]; then
-#              cat ~/.patchbomb-$1
-#          fi
-#      }
-#
-#
-# Writing completion functions for additional commands:
-#
-# If it exists, the function _hg_cmd_foo will be called without
-# arguments to generate the completion candidates for the hg command
-# "foo".  If the command receives some arguments that aren't options
-# even though they start with a "-", you can define a function called
-# _hg_opt_foo to generate the completion candidates.  If _hg_opt_foo
-# doesn't return 0, regular completion for options is attempted.
-#
-# In addition to the regular completion variables provided by bash,
-# the following variables are also set:
-# - $hg - the hg program being used (e.g. /usr/bin/hg)
-# - $cmd - the name of the hg command being completed
-# - $cmd_index - the index of $cmd in $COMP_WORDS
-# - $cur - the current argument being completed
-# - $prev - the argument before $cur
-# - $global_args - "|"-separated list of global options that accept
-#                  an argument (e.g. '--cwd|-R|--repository')
-# - $canonical - 1 if we canonicalized $cmd before calling the function
-#                0 otherwise
-#
-
-shopt -s extglob
-
-_hg_cmd()
-{
-    HGPLAIN=1 "$hg" "$@" 2>/dev/null
-}
-
-_hg_commands()
-{
-    local commands
-    commands="$(HGPLAINEXCEPT=alias _hg_cmd debugcomplete "$cur")" || commands=""
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$commands' -- "$cur"))
-}
-
-_hg_paths()
-{
-    local paths="$(_hg_cmd paths -q)"
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$paths' -- "$cur"))
-}
-
-_hg_repos()
-{
-    local i
-    for i in $(compgen -d -- "$cur"); do
-	test ! -d "$i"/.hg || COMPREPLY=(${COMPREPLY[@]:-} "$i")
-    done
-}
-
-_hg_debugpathcomplete()
-{
-    local files="$(_hg_cmd debugpathcomplete $1 "$cur")"
-    local IFS=$'\n'
-    compopt -o filenames 2>/dev/null
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$files' -- "$cur"))
-}
-
-_hg_status()
-{
-    local files="$(_hg_cmd status -n$1 "glob:$cur**")"
-    local IFS=$'\n'
-    compopt -o filenames 2>/dev/null
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$files' -- "$cur"))
-}
-
-_hg_bookmarks()
-{
-    local bookmarks="$(_hg_cmd bookmarks -q)"
-    local IFS=$'\n'
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$bookmarks' -- "$cur"))
-}
-
-_hg_labels()
-{
-    local labels="$(_hg_cmd debuglabelcomplete "$cur")"
-    local IFS=$'\n'
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$labels' -- "$cur"))
-}
-
-# this is "kind of" ugly...
-_hg_count_non_option()
-{
-    local i count=0
-    local filters="$1"
-
-    for ((i=1; $i<=$COMP_CWORD; i++)); do
-	if [[ "${COMP_WORDS[i]}" != -* ]]; then
-	    if [[ ${COMP_WORDS[i-1]} == @($filters|$global_args) ]]; then
-		continue
-	    fi
-	    count=$(($count + 1))
-	fi
-    done
-
-    echo $(($count - 1))
-}
-
-_hg()
-{
-    local cur prev cmd cmd_index opts i
-    # global options that receive an argument
-    local global_args='--cwd|-R|--repository'
-    local hg="$1"
-    local canonical=0
-
-    COMPREPLY=()
-    cur="$2"
-    prev="$3"
-
-    # searching for the command
-    # (first non-option argument that doesn't follow a global option that
-    #  receives an argument)
-    for ((i=1; $i<=$COMP_CWORD; i++)); do
-	if [[ ${COMP_WORDS[i]} != -* ]]; then
-	    if [[ ${COMP_WORDS[i-1]} != @($global_args) ]]; then
-		cmd="${COMP_WORDS[i]}"
-		cmd_index=$i
-		break
-	    fi
-	fi
-    done
-
-    if [[ "$cur" == -* ]]; then
-	if [ "$(type -t "_hg_opt_$cmd")" = function ] && "_hg_opt_$cmd"; then
-	    return
-	fi
-
-	opts=$(_hg_cmd debugcomplete --options "$cmd")
-
-	COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$opts' -- "$cur"))
-	return
-    fi
-
-    # global options
-    case "$prev" in
-	-R|--repository)
-	    _hg_paths
-	    _hg_repos
-	    return
-	;;
-	--cwd)
-	    # Stick with default bash completion
-	    return
-	;;
-    esac
-
-    if [ -z "$cmd" ] || [ $COMP_CWORD -eq $i ]; then
-	_hg_commands
-	return
-    fi
-
-    # try to generate completion candidates for whatever command the user typed
-    local help
-    if _hg_command_specific; then
-	return
-    fi
-
-    # canonicalize the command name and try again
-    help=$(_hg_cmd help "$cmd")
-    if [ $? -ne 0 ]; then
-	# Probably either the command doesn't exist or it's ambiguous
-	return
-    fi
-    cmd=${help#hg }
-    cmd=${cmd%%[$' \n']*}
-    canonical=1
-    _hg_command_specific
-}
-
-_hg_command_specific()
-{
-    if [ "$(type -t "_hg_cmd_$cmd")" = function ]; then
-	"_hg_cmd_$cmd"
-	return 0
-    fi
-
-    if [ "$cmd" != status ] && [ "$prev" = -r ] || [ "$prev" == --rev ]; then
-	if [ $canonical = 1 ]; then
-	    _hg_labels
-	    return 0
-	elif [[ status != "$cmd"* ]]; then
-            _hg_labels
-	    return 0
-	else
-	    return 1
-	fi
-    fi
-
-    case "$cmd" in
-	help)
-	    _hg_commands
-	;;
-	export)
-	    if _hg_ext_mq_patchlist qapplied && [ "${COMPREPLY[*]}" ]; then
-		return 0
-	    fi
-	    _hg_labels
-	;;
-	manifest|update|up|checkout|co)
-	    _hg_labels
-	;;
-	pull|push|outgoing|incoming)
-	    _hg_paths
-	    _hg_repos
-	;;
-	paths)
-	    _hg_paths
-	;;
-	add)
-	    _hg_status "u"
-	;;
-	merge)
-	    _hg_labels
-	;;
-	commit|ci|record)
-	    _hg_status "mar"
-	;;
-	remove|rm)
-	    _hg_debugpathcomplete -n
-	;;
-	forget)
-	    _hg_debugpathcomplete -fa
-	;;
-	diff)
-	    _hg_status "mar"
-	;;
-	revert)
-	    _hg_debugpathcomplete
-	;;
-	clone)
-	    local count=$(_hg_count_non_option)
-	    if [ $count = 1 ]; then
-		_hg_paths
-	    fi
-	    _hg_repos
-	;;
-	debugindex|debugindexdot)
-	    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -f -X "!*.i" -- "$cur"))
-	;;
-	debugdata)
-	    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -f -X "!*.d" -- "$cur"))
-	;;
-	*)
-	    return 1
-	;;
-    esac
-
-    return 0
-}
-
-complete -o bashdefault -o default -F _hg hg \
-    || complete -o default -F _hg hg
-
-
-# Completion for commands provided by extensions
-
-# bookmarks
-_hg_cmd_bookmarks()
-{
-    if [[ "$prev" = @(-d|--delete|-m|--rename) ]]; then
-        _hg_bookmarks
-        return
-    fi
-}
-
-# mq
-_hg_ext_mq_patchlist()
-{
-    local patches
-    patches=$(_hg_cmd $1)
-    if [ $? -eq 0 ] && [ "$patches" ]; then
-	COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$patches' -- "$cur"))
-	return 0
-    fi
-    return 1
-}
-
-_hg_ext_mq_queues()
-{
-    local root=$(_hg_cmd root)
-    local n
-    for n in $(cd "$root"/.hg && compgen -d -- "$cur"); do
-	# I think we're usually not interested in the regular "patches" queue
-	# so just filter it.
-	if [ "$n" != patches ] && [ -e "$root/.hg/$n/series" ]; then
-	    COMPREPLY=(${COMPREPLY[@]:-} "$n")
-	fi
-    done
-}
-
-_hg_cmd_qpop()
-{
-    if [[ "$prev" = @(-n|--name) ]]; then
-	_hg_ext_mq_queues
-	return
-    fi
-    _hg_ext_mq_patchlist qapplied
-}
-
-_hg_cmd_qpush()
-{
-    if [[ "$prev" = @(-n|--name) ]]; then
-	_hg_ext_mq_queues
-	return
-    fi
-    _hg_ext_mq_patchlist qunapplied
-}
-
-_hg_cmd_qgoto()
-{
-    if [[ "$prev" = @(-n|--name) ]]; then
-	_hg_ext_mq_queues
-	return
-    fi
-    _hg_ext_mq_patchlist qseries
-}
-
-_hg_cmd_qdelete()
-{
-    local qcmd=qunapplied
-    if [[ "$prev" = @(-r|--rev) ]]; then
-	qcmd=qapplied
-    fi
-    _hg_ext_mq_patchlist $qcmd
-}
-
-_hg_cmd_qfinish()
-{
-    if [[ "$prev" = @(-a|--applied) ]]; then
-	return
-    fi
-    _hg_ext_mq_patchlist qapplied
-}
-
-_hg_cmd_qsave()
-{
-    if [[ "$prev" = @(-n|--name) ]]; then
-	_hg_ext_mq_queues
-	return
-    fi
-}
-
-_hg_cmd_rebase() {
-   if [[ "$prev" = @(-s|--source|-d|--dest|-b|--base|-r|--rev) ]]; then
-       _hg_labels
-       return
-   fi
-}
-
-_hg_cmd_strip()
-{
-    _hg_labels
-}
-
-_hg_cmd_qcommit()
-{
-    local root=$(_hg_cmd root)
-    # this is run in a sub-shell, so we can't use _hg_status
-    local files=$(cd "$root/.hg/patches" && _hg_cmd status -nmar)
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$files' -- "$cur"))
-}
-
-_hg_cmd_qfold()
-{
-    _hg_ext_mq_patchlist qunapplied
-}
-
-_hg_cmd_qrename()
-{
-    _hg_ext_mq_patchlist qseries
-}
-
-_hg_cmd_qheader()
-{
-    _hg_ext_mq_patchlist qseries
-}
-
-_hg_cmd_qclone()
-{
-    local count=$(_hg_count_non_option)
-    if [ $count = 1 ]; then
-	_hg_paths
-    fi
-    _hg_repos
-}
-
-_hg_ext_mq_guards()
-{
-    _hg_cmd qselect --series | sed -e 's/^.//'
-}
-
-_hg_cmd_qselect()
-{
-    local guards=$(_hg_ext_mq_guards)
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$guards' -- "$cur"))
-}
-
-_hg_cmd_qguard()
-{
-    local prefix=''
-
-    if [[ "$cur" == +* ]]; then
-	prefix=+
-    elif [[ "$cur" == -* ]]; then
-	prefix=-
-    fi
-    local ncur=${cur#[-+]}
-
-    if ! [ "$prefix" ]; then
-	_hg_ext_mq_patchlist qseries
-	return
-    fi
-
-    local guards=$(_hg_ext_mq_guards)
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -P $prefix -W '$guards' -- "$ncur"))
-}
-
-_hg_opt_qguard()
-{
-    local i
-    for ((i=cmd_index+1; i<=COMP_CWORD; i++)); do
-	if [[ ${COMP_WORDS[i]} != -* ]]; then
-	    if [[ ${COMP_WORDS[i-1]} != @($global_args) ]]; then
-		_hg_cmd_qguard
-		return 0
-	    fi
-	elif [ "${COMP_WORDS[i]}" = -- ]; then
-	    _hg_cmd_qguard
-	    return 0
-	fi
-    done
-    return 1
-}
-
-_hg_cmd_qqueue()
-{
-    local q
-    local queues
-    local opts="--list --create --rename --delete --purge"
-
-    queues=$( _hg_cmd qqueue --quiet )
-
-    COMPREPLY=( $( compgen -W "${opts} ${queues}" "${cur}" ) )
-}
-
-
-# hbisect
-_hg_cmd_bisect()
-{
-    local i subcmd
-
-    # find the sub-command
-    for ((i=cmd_index+1; i<=COMP_CWORD; i++)); do
-	if [[ ${COMP_WORDS[i]} != -* ]]; then
-	    if [[ ${COMP_WORDS[i-1]} != @($global_args) ]]; then
-		subcmd="${COMP_WORDS[i]}"
-		break
-	    fi
-	fi
-    done
-
-    if [ -z "$subcmd" ] || [ $COMP_CWORD -eq $i ] || [ "$subcmd" = help ]; then
-	COMPREPLY=(${COMPREPLY[@]:-}
-		   $(compgen -W 'bad good help init next reset' -- "$cur"))
-	return
-    fi
-
-    case "$subcmd" in
-	good|bad)
-	    _hg_labels
-	    ;;
-    esac
-
-    return
-}
-
-
-# patchbomb
-_hg_cmd_email()
-{
-    case "$prev" in
-	-c|--cc|-t|--to|-f|--from|--bcc)
-	    # we need an e-mail address. let the user provide a function
-	    # to get them
-	    if [ "$(type -t _hg_emails)" = function ]; then
-		local arg=to
-		if [[ "$prev" == @(-f|--from) ]]; then
-		    arg=from
-		fi
-		local addresses=$(_hg_emails $arg)
-		COMPREPLY=(${COMPREPLY[@]:-}
-			   $(compgen -W '$addresses' -- "$cur"))
-	    fi
-	    return
-	    ;;
-	-m|--mbox)
-	    # fallback to standard filename completion
-	    return
-	    ;;
-	-s|--subject)
-	    # free form string
-	    return
-	    ;;
-    esac
-
-    _hg_labels
-    return
-}
-
-
-# gpg
-_hg_cmd_sign()
-{
-    _hg_labels
-}
-
-
-# transplant
-_hg_cmd_transplant()
-{
-    case "$prev" in
-	-s|--source)
-	    _hg_paths
-	    _hg_repos
-	    return
-	    ;;
-	--filter)
-	    # standard filename completion
-	    return
-	    ;;
-    esac
-
-    # all other transplant options values and command parameters are revisions
-    _hg_labels
-    return
-}
-
-# shelve
-_hg_shelves()
-{
-    local shelves="$(_hg_cmd unshelve -l .)"
-    local IFS=$'\n'
-    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$shelves' -- "$cur"))
-}
-
-_hg_cmd_shelve()
-{
-    _hg_status "mard"
-}
-
-_hg_cmd_unshelve()
-{
-    _hg_shelves
-}