git-completion.bash 49.2 KB
Newer Older
1
#!bash
2 3 4
#
# bash completion support for core Git.
#
5
# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
6
# Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
7
# Distributed under the GNU General Public License, version 2.0.
8 9 10 11 12 13 14 15
#
# The contained completion routines provide support for completing:
#
#    *) local and remote branch names
#    *) local and remote tag names
#    *) .git/remotes file names
#    *) git 'subcommands'
#    *) tree paths within 'ref:path/to/file' expressions
16
#    *) common --long-options
17 18 19 20 21 22 23
#
# 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
#
J
Jonathan Nieder 已提交
24
#    3) Consider changing your PS1 to also show the current branch:
25 26 27 28 29 30
#        PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
#
#       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.
#
31 32 33 34 35
#       In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty
#       value, unstaged (*) and staged (+) changes will be shown next
#       to the branch name.  You can configure this per-repository
#       with the bash.showDirtyState variable, which defaults to true
#       once GIT_PS1_SHOWDIRTYSTATE is enabled.
36
#
37 38 39 40
#       You can also see if currently something is stashed, by setting
#       GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
#       then a '$' will be shown next to the branch name.
#
41 42 43 44
#       If you would like to see if there're untracked files, then you can
#       set GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're
#       untracked files, then a '%' will be shown next to the branch name.
#
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
#       If you would like to see the difference between HEAD and its
#       upstream, set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates
#       you are behind, ">" indicates you are ahead, and "<>"
#       indicates you have diverged.  You can further control
#       behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated
#       list of values:
#           verbose       show number of commits ahead/behind (+/-) upstream
#           legacy        don't use the '--count' option available in recent
#                         versions of git-rev-list
#           git           always compare HEAD to @{upstream}
#           svn           always compare HEAD to your SVN upstream
#       By default, __git_ps1 will compare HEAD to your SVN upstream
#       if it can find one, or @{upstream} otherwise.  Once you have
#       set GIT_PS1_SHOWUPSTREAM, you can override it on a
#       per-repository basis by setting the bash.showUpstream config
#       variable.
#
#
63 64 65 66 67 68 69 70 71 72 73
# To submit patches:
#
#    *) Read Documentation/SubmittingPatches
#    *) Send all patches to the current maintainer:
#
#       "Shawn O. Pearce" <spearce@spearce.org>
#
#    *) Always CC the Git mailing list:
#
#       git@vger.kernel.org
#
74

75 76 77 78 79
case "$COMP_WORDBREAKS" in
*:*) : great ;;
*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
esac

80 81
# __gitdir accepts 0 or 1 arguments (i.e., location)
# returns location of .git repo
82 83
__gitdir ()
{
84
	if [ -z "${1-}" ]; then
85
		if [ -n "${__git_dir-}" ]; then
86 87 88 89 90 91 92 93 94 95 96
			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
97 98
}

99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
# stores the divergence from upstream in $p
# used by GIT_PS1_SHOWUPSTREAM
__git_ps1_show_upstream ()
{
	local key value
	local svn_remote=() svn_url_pattern count n
	local upstream=git legacy="" verbose=""

	# get some config options from git-config
	while read key value; do
		case "$key" in
		bash.showupstream)
			GIT_PS1_SHOWUPSTREAM="$value"
			if [[ -z "${GIT_PS1_SHOWUPSTREAM}" ]]; then
				p=""
				return
			fi
			;;
		svn-remote.*.url)
			svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
			svn_url_pattern+="\\|$value"
			upstream=svn+git # default upstream is SVN if available, else git
			;;
		esac
	done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')

	# parse configuration values
	for option in ${GIT_PS1_SHOWUPSTREAM}; do
		case "$option" in
		git|svn) upstream="$option" ;;
		verbose) verbose=1 ;;
		legacy)  legacy=1  ;;
		esac
	done

	# Find our upstream
	case "$upstream" in
	git)    upstream="@{upstream}" ;;
	svn*)
		# get the upstream from the "git-svn-id: ..." in a commit message
		# (git-svn uses essentially the same procedure internally)
		local svn_upstream=($(git log --first-parent -1 \
					--grep="^git-svn-id: \(${svn_url_pattern:2}\)" 2>/dev/null))
		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
			svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
			svn_upstream=${svn_upstream%@*}
			for ((n=1; "$n" <= "${#svn_remote[@]}"; ++n)); do
				svn_upstream=${svn_upstream#${svn_remote[$n]}}
			done

			if [[ -z "$svn_upstream" ]]; then
				# default branch name for checkouts with no layout:
				upstream=${GIT_SVN_ID:-git-svn}
			else
				upstream=${svn_upstream#/}
			fi
		elif [[ "svn+git" = "$upstream" ]]; then
			upstream="@{upstream}"
		fi
		;;
	esac

	# Find how many commits we are ahead/behind our upstream
	if [[ -z "$legacy" ]]; then
		count="$(git rev-list --count --left-right \
				"$upstream"...HEAD 2>/dev/null)"
	else
		# produce equivalent output to --count for older versions of git
		local commits
		if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
		then
			local commit behind=0 ahead=0
			for commit in $commits
			do
				case "$commit" in
				"<"*) let ++behind
					;;
				*)    let ++ahead
					;;
				esac
			done
			count="$behind	$ahead"
		else
			count=""
		fi
	fi

	# calculate the result
	if [[ -z "$verbose" ]]; then
		case "$count" in
		"") # no upstream
			p="" ;;
		"0	0") # equal to upstream
			p="=" ;;
		"0	"*) # ahead of upstream
			p=">" ;;
		*"	0") # behind upstream
			p="<" ;;
		*)	    # diverged from upstream
			p="<>" ;;
		esac
	else
		case "$count" in
		"") # no upstream
			p="" ;;
		"0	0") # equal to upstream
			p=" u=" ;;
		"0	"*) # ahead of upstream
			p=" u+${count#0	}" ;;
		*"	0") # behind upstream
			p=" u-${count%	0}" ;;
		*)	    # diverged from upstream
			p=" u+${count#*	}-${count%	*}" ;;
		esac
	fi

}


218 219
# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
# returns text to add to bash PS1 prompt (includes branch name)
220 221
__git_ps1 ()
{
222
	local g="$(__gitdir)"
223
	if [ -n "$g" ]; then
224 225
		local r=""
		local b=""
226
		if [ -f "$g/rebase-merge/interactive" ]; then
227
			r="|REBASE-i"
228
			b="$(cat "$g/rebase-merge/head-name")"
229
		elif [ -d "$g/rebase-merge" ]; then
230
			r="|REBASE-m"
231
			b="$(cat "$g/rebase-merge/head-name")"
232
		else
233 234 235 236 237 238 239 240 241
			if [ -d "$g/rebase-apply" ]; then
				if [ -f "$g/rebase-apply/rebasing" ]; then
					r="|REBASE"
				elif [ -f "$g/rebase-apply/applying" ]; then
					r="|AM"
				else
					r="|AM/REBASE"
				fi
			elif [ -f "$g/MERGE_HEAD" ]; then
242
				r="|MERGING"
243
			elif [ -f "$g/BISECT_LOG" ]; then
244 245
				r="|BISECTING"
			fi
246 247

			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
248 249 250 251 252 253 254 255 256 257

				b="$(
				case "${GIT_PS1_DESCRIBE_STYLE-}" in
				(contains)
					git describe --contains HEAD ;;
				(branch)
					git describe --contains --all HEAD ;;
				(describe)
					git describe HEAD ;;
				(* | default)
K
knittl 已提交
258
					git describe --tags --exact-match HEAD ;;
259 260
				esac 2>/dev/null)" ||

261 262 263 264
				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
				b="unknown"
				b="($b)"
			}
265 266
		fi

267 268 269 270 271
		local w=""
		local i=""
		local s=""
		local u=""
		local c=""
272
		local p=""
273

274
		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
275
			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
276 277 278 279
				c="BARE:"
			else
				b="GIT_DIR!"
			fi
280 281 282
		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
				if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
283
					git diff --no-ext-diff --quiet --exit-code || w="*"
284
					if git rev-parse --quiet --verify HEAD >/dev/null; then
285
						git diff-index --cached --quiet HEAD -- || i="+"
286 287 288
					else
						i="#"
					fi
289 290
				fi
			fi
291 292 293
			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
			        git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
			fi
294 295 296 297 298 299

			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
			   if [ -n "$(git ls-files --others --exclude-standard)" ]; then
			      u="%"
			   fi
			fi
300 301 302 303

			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
				__git_ps1_show_upstream
			fi
304 305
		fi

306
		local f="$w$i$s$u"
307
		printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
308 309 310
	fi
}

311
# __gitcomp_1 requires 2 arguments
312 313 314 315 316 317 318 319 320 321 322 323
__gitcomp_1 ()
{
	local c IFS=' '$'\t'$'\n'
	for c in $1; do
		case "$c$2" in
		--*=*) printf %s$'\n' "$c$2" ;;
		*.)    printf %s$'\n' "$c$2" ;;
		*)     printf %s$'\n' "$c$2 " ;;
		esac
	done
}

324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350
if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
_get_comp_words_by_ref ()
{
	while [ $# -gt 0 ]; do
		case "$1" in
		cur)
			cur=${COMP_WORDS[COMP_CWORD]}
			;;
		prev)
			prev=${COMP_WORDS[COMP_CWORD-1]}
			;;
		words)
			words=("${COMP_WORDS[@]}")
			;;
		cword)
			cword=$COMP_CWORD
			;;
		-n)
			# assume COMP_WORDBREAKS is already set sanely
			shift
			;;
		esac
		shift
	done
}
fi

351 352
# __gitcomp accepts 1, 2, 3, or 4 arguments
# generates completion reply with compgen
353 354
__gitcomp ()
{
355 356
	local cur
	_get_comp_words_by_ref -n =: cur
357
	if [ $# -gt 2 ]; then
358 359
		cur="$3"
	fi
360 361 362 363 364
	case "$cur" in
	--*=)
		COMPREPLY=()
		;;
	*)
365
		local IFS=$'\n'
366 367
		COMPREPLY=($(compgen -P "${2-}" \
			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
368
			-- "$cur"))
369 370
		;;
	esac
371 372
}

373
# __git_heads accepts 0 or 1 arguments (to pass to __gitdir)
374 375
__git_heads ()
{
376
	local cmd i is_hash=y dir="$(__gitdir "${1-}")"
377
	if [ -d "$dir" ]; then
378 379
		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
			refs/heads
380 381
		return
	fi
382
	for i in $(git ls-remote "${1-}" 2>/dev/null); do
383 384 385 386 387 388 389 390 391
		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
}

392
# __git_tags accepts 0 or 1 arguments (to pass to __gitdir)
393 394
__git_tags ()
{
395
	local cmd i is_hash=y dir="$(__gitdir "${1-}")"
396
	if [ -d "$dir" ]; then
397 398
		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
			refs/tags
399 400
		return
	fi
401
	for i in $(git ls-remote "${1-}" 2>/dev/null); do
402 403 404 405 406 407 408 409 410
		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
}

411
# __git_refs accepts 0 or 1 arguments (to pass to __gitdir)
412 413
__git_refs ()
{
414
	local i is_hash=y dir="$(__gitdir "${1-}")"
415 416
	local cur format refs
	_get_comp_words_by_ref -n =: cur
417
	if [ -d "$dir" ]; then
S
SZEDER Gábor 已提交
418 419 420 421 422 423
		case "$cur" in
		refs|refs/*)
			format="refname"
			refs="${cur%/*}"
			;;
		*)
424 425 426
			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
				if [ -e "$dir/$i" ]; then echo $i; fi
			done
S
SZEDER Gábor 已提交
427 428 429 430 431 432
			format="refname:short"
			refs="refs/tags refs/heads refs/remotes"
			;;
		esac
		git --git-dir="$dir" for-each-ref --format="%($format)" \
			$refs
433
		return
434
	fi
435
	for i in $(git ls-remote "$dir" 2>/dev/null); do
436 437 438 439 440
		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/}" ;;
441
		n,refs/remotes/*) is_hash=y; echo "${i#refs/remotes/}" ;;
442 443 444 445 446
		n,*) is_hash=y; echo "$i" ;;
		esac
	done
}

447
# __git_refs2 requires 1 argument (to pass to __git_refs)
448 449
__git_refs2 ()
{
450 451 452
	local i
	for i in $(__git_refs "$1"); do
		echo "$i:$i"
453 454 455
	done
}

456
# __git_refs_remotes requires 1 argument (to pass to ls-remote)
457 458 459
__git_refs_remotes ()
{
	local cmd i is_hash=y
460
	for i in $(git ls-remote "$1" 2>/dev/null); do
461 462 463 464 465 466 467 468 469 470 471 472 473
		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
}

474 475
__git_remotes ()
{
476
	local i ngoff IFS=$'\n' d="$(__gitdir)"
477
	shopt -q nullglob || ngoff=1
478
	shopt -s nullglob
479 480
	for i in "$d/remotes"/*; do
		echo ${i#$d/remotes/}
481
	done
482
	[ "$ngoff" ] && shopt -u nullglob
483 484 485
	for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do
		i="${i#remote.}"
		echo "${i/.url*/}"
486
	done
487 488
}

J
Jonathan Nieder 已提交
489
__git_list_merge_strategies ()
490
{
491 492 493 494 495 496
	git merge -s help 2>&1 |
	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
		s/\.$//
		s/.*://
		s/^[ 	]*//
		s/[ 	]*$//
497
		p
498
	}'
499
}
J
Jonathan Nieder 已提交
500 501 502 503 504 505 506 507 508 509 510

__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 ()
{
	: ${__git_merge_strategies:=$(__git_list_merge_strategies)}
}
511

512 513
__git_complete_file ()
{
514 515
	local pfx ls ref cur
	_get_comp_words_by_ref -n =: cur
516 517
	case "$cur" in
	?*:*)
518 519
		ref="${cur%%:*}"
		cur="${cur#*:}"
520 521
		case "$cur" in
		?*/*)
522 523
			pfx="${cur%/*}"
			cur="${cur##*/}"
524 525 526 527 528 529 530
			ls="$ref:$pfx"
			pfx="$pfx/"
			;;
		*)
			ls="$ref"
			;;
	    esac
531 532 533 534 535 536

		case "$COMP_WORDBREAKS" in
		*:*) : great ;;
		*)   pfx="$ref:$pfx" ;;
		esac

537
		local IFS=$'\n'
538
		COMPREPLY=($(compgen -P "$pfx" \
539
			-W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
540 541 542 543 544 545 546 547
				| sed '/^100... blob /{
				           s,^.*	,,
				           s,$, ,
				       }
				       /^120000 blob /{
				           s,^.*	,,
				           s,$, ,
				       }
548 549 550 551 552 553 554 555
				       /^040000 tree /{
				           s,^.*	,,
				           s,$,/,
				       }
				       s/^.*	//')" \
			-- "$cur"))
		;;
	*)
556
		__gitcomp "$(__git_refs)"
557 558 559 560
		;;
	esac
}

561 562
__git_complete_revlist ()
{
563 564
	local pfx cur
	_get_comp_words_by_ref -n =: cur
565 566 567 568
	case "$cur" in
	*...*)
		pfx="${cur%...*}..."
		cur="${cur#*...}"
569
		__gitcomp "$(__git_refs)" "$pfx" "$cur"
570 571 572 573
		;;
	*..*)
		pfx="${cur%..*}.."
		cur="${cur#*..}"
574 575
		__gitcomp "$(__git_refs)" "$pfx" "$cur"
		;;
576
	*)
577
		__gitcomp "$(__git_refs)"
578 579 580 581
		;;
	esac
}

582 583
__git_complete_remote_or_refspec ()
{
584 585 586
	local cur words cword
	_get_comp_words_by_ref -n =: cur words cword
	local cmd="${words[1]}"
587
	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
588 589
	while [ $c -lt $cword ]; do
		i="${words[c]}"
590
		case "$i" in
591 592 593 594 595 596 597 598 599 600 601
		--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
		--all)
			case "$cmd" in
			push) no_complete_refspec=1 ;;
			fetch)
				COMPREPLY=()
				return
				;;
			*) ;;
			esac
			;;
602 603 604 605 606 607 608 609 610
		-*) ;;
		*) remote="$i"; break ;;
		esac
		c=$((++c))
	done
	if [ -z "$remote" ]; then
		__gitcomp "$(__git_remotes)"
		return
	fi
611 612 613 614
	if [ $no_complete_refspec = 1 ]; then
		COMPREPLY=()
		return
	fi
615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654
	[ "$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
			__gitcomp "$(__git_refs2 "$remote")" "$pfx" "$cur"
		else
			__gitcomp "$(__git_refs)" "$pfx" "$cur"
		fi
		;;
	pull)
		if [ $lhs = 1 ]; then
			__gitcomp "$(__git_refs "$remote")" "$pfx" "$cur"
		else
			__gitcomp "$(__git_refs)" "$pfx" "$cur"
		fi
		;;
	push)
		if [ $lhs = 1 ]; then
			__gitcomp "$(__git_refs)" "$pfx" "$cur"
		else
			__gitcomp "$(__git_refs "$remote")" "$pfx" "$cur"
		fi
		;;
	esac
}

655 656
__git_complete_strategy ()
{
657 658
	local cur prev
	_get_comp_words_by_ref -n =: cur prev
J
Jonathan Nieder 已提交
659
	__git_compute_merge_strategies
660
	case "$prev" in
661
	-s|--strategy)
J
Jonathan Nieder 已提交
662
		__gitcomp "$__git_merge_strategies"
663 664 665 666
		return 0
	esac
	case "$cur" in
	--strategy=*)
J
Jonathan Nieder 已提交
667
		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
668 669 670 671 672 673
		return 0
		;;
	esac
	return 1
}

J
Jonathan Nieder 已提交
674
__git_list_all_commands ()
675 676
{
	local i IFS=" "$'\n'
677
	for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
678 679 680 681 682 683 684 685
	do
		case $i in
		*--*)             : helper pattern;;
		*) echo $i;;
		esac
	done
}

J
Jonathan Nieder 已提交
686 687 688 689 690 691 692
__git_all_commands=
__git_compute_all_commands ()
{
	: ${__git_all_commands:=$(__git_list_all_commands)}
}

__git_list_porcelain_commands ()
693 694
{
	local i IFS=" "$'\n'
J
Jonathan Nieder 已提交
695 696
	__git_compute_all_commands
	for i in "help" $__git_all_commands
697 698
	do
		case $i in
699
		*--*)             : helper pattern;;
700 701 702
		applymbox)        : ask gittus;;
		applypatch)       : ask gittus;;
		archimport)       : import;;
703
		cat-file)         : plumbing;;
704
		check-attr)       : plumbing;;
705
		check-ref-format) : plumbing;;
706
		checkout-index)   : plumbing;;
707
		commit-tree)      : plumbing;;
708
		count-objects)    : infrequent;;
709 710
		cvsexportcommit)  : export;;
		cvsimport)        : import;;
711 712
		cvsserver)        : daemon;;
		daemon)           : daemon;;
713 714 715
		diff-files)       : plumbing;;
		diff-index)       : plumbing;;
		diff-tree)        : plumbing;;
S
Shawn O. Pearce 已提交
716
		fast-import)      : import;;
717
		fast-export)      : export;;
718
		fsck-objects)     : plumbing;;
719
		fetch-pack)       : plumbing;;
720
		fmt-merge-msg)    : plumbing;;
721
		for-each-ref)     : plumbing;;
722 723 724
		hash-object)      : plumbing;;
		http-*)           : transport;;
		index-pack)       : plumbing;;
725
		init-db)          : deprecated;;
726
		local-fetch)      : plumbing;;
727 728 729 730
		lost-found)       : infrequent;;
		ls-files)         : plumbing;;
		ls-remote)        : plumbing;;
		ls-tree)          : plumbing;;
731 732 733 734 735 736 737 738 739 740 741
		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;;
742 743 744
		prune)            : plumbing;;
		prune-packed)     : plumbing;;
		quiltimport)      : import;;
745 746
		read-tree)        : plumbing;;
		receive-pack)     : plumbing;;
747
		reflog)           : plumbing;;
748
		remote-*)         : transport;;
749
		repo-config)      : deprecated;;
750 751 752 753 754 755
		rerere)           : plumbing;;
		rev-list)         : plumbing;;
		rev-parse)        : plumbing;;
		runstatus)        : plumbing;;
		sh-setup)         : internal;;
		shell)            : daemon;;
756
		show-ref)         : plumbing;;
757 758 759 760 761
		send-pack)        : plumbing;;
		show-index)       : plumbing;;
		ssh-*)            : transport;;
		stripspace)       : plumbing;;
		symbolic-ref)     : plumbing;;
762
		tar-tree)         : deprecated;;
763 764
		unpack-file)      : plumbing;;
		unpack-objects)   : plumbing;;
765
		update-index)     : plumbing;;
766 767 768 769 770
		update-ref)       : plumbing;;
		update-server-info) : daemon;;
		upload-archive)   : plumbing;;
		upload-pack)      : plumbing;;
		write-tree)       : plumbing;;
771 772
		var)              : infrequent;;
		verify-pack)      : infrequent;;
773
		verify-tag)       : plumbing;;
774 775 776 777
		*) echo $i;;
		esac
	done
}
J
Jonathan Nieder 已提交
778 779 780 781 782 783 784

__git_porcelain_commands=
__git_compute_porcelain_commands ()
{
	__git_compute_all_commands
	: ${__git_porcelain_commands:=$(__git_list_porcelain_commands)}
}
785

786 787
__git_aliases ()
{
788
	local i IFS=$'\n'
789
	for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do
790 791 792 793 794 795
		case "$i" in
		alias.*)
			i="${i#alias.}"
			echo "${i/ */}"
			;;
		esac
796
	done
797 798
}

799
# __git_aliased_command requires 1 argument
800 801
__git_aliased_command ()
{
802
	local word cmdline=$(git --git-dir="$(__gitdir)" \
803
		config --get "alias.$1")
804
	for word in $cmdline; do
805
		case "$word" in
806 807
		\!gitk|gitk)
			echo "gitk"
808
			return
809
			;;
810 811 812 813 814 815
		\!*)	: shell command alias ;;
		-*)	: option ;;
		*=*)	: setting env ;;
		git)	: git itself ;;
		*)
			echo "$word"
816
			return
817
		esac
818 819 820
	done
}

821 822
# __git_find_on_cmdline requires 1 argument
__git_find_on_cmdline ()
823
{
824 825 826 827
	local word subcommand c=1 words cword
	_get_comp_words_by_ref -n =: words cword
	while [ $c -lt $cword ]; do
		word="${words[c]}"
828 829 830 831 832 833 834 835 836 837
		for subcommand in $1; do
			if [ "$subcommand" = "$word" ]; then
				echo "$subcommand"
				return
			fi
		done
		c=$((++c))
	done
}

838 839
__git_has_doubledash ()
{
840 841 842 843
	local c=1 words cword
	_get_comp_words_by_ref -n =: words cword
	while [ $c -lt $cword ]; do
		if [ "--" = "${words[c]}" ]; then
844 845 846 847 848 849 850
			return 0
		fi
		c=$((++c))
	done
	return 1
}

851
__git_whitespacelist="nowarn warn error error-all fix"
852 853 854

_git_am ()
{
855 856
	local cur dir="$(__gitdir)"
	_get_comp_words_by_ref -n =: cur
857
	if [ -d "$dir"/rebase-apply ]; then
858
		__gitcomp "--skip --continue --resolved --abort"
859 860 861 862
		return
	fi
	case "$cur" in
	--whitespace=*)
863
		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
864 865 866
		return
		;;
	--*)
867
		__gitcomp "
868
			--3way --committer-date-is-author-date --ignore-date
869
			--ignore-whitespace --ignore-space-change
870
			--interactive --keep --no-utf8 --signoff --utf8
871
			--whitespace= --scissors
872
			"
873 874 875 876 877 878 879
		return
	esac
	COMPREPLY=()
}

_git_apply ()
{
880 881
	local cur
	_get_comp_words_by_ref -n =: cur
882 883
	case "$cur" in
	--whitespace=*)
884
		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
885 886 887
		return
		;;
	--*)
888
		__gitcomp "
889 890 891
			--stat --numstat --summary --check --index
			--cached --index-info --reverse --reject --unidiff-zero
			--apply --no-add --exclude=
892
			--ignore-whitespace --ignore-space-change
893
			--whitespace= --inaccurate-eof --verbose
894
			"
895 896 897 898 899
		return
	esac
	COMPREPLY=()
}

900 901
_git_add ()
{
902 903
	__git_has_doubledash && return

904 905
	local cur
	_get_comp_words_by_ref -n =: cur
906 907
	case "$cur" in
	--*)
908 909
		__gitcomp "
			--interactive --refresh --patch --update --dry-run
910
			--ignore-errors --intent-to-add
911
			"
912 913 914 915 916
		return
	esac
	COMPREPLY=()
}

917 918
_git_archive ()
{
919 920
	local cur
	_get_comp_words_by_ref -n =: cur
921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940
	case "$cur" in
	--format=*)
		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
		return
		;;
	--remote=*)
		__gitcomp "$(__git_remotes)" "" "${cur##--remote=}"
		return
		;;
	--*)
		__gitcomp "
			--format= --list --verbose
			--prefix= --remote= --exec=
			"
		return
		;;
	esac
	__git_complete_file
}

941 942
_git_bisect ()
{
943 944
	__git_has_doubledash && return

945
	local subcommands="start bad good skip reset visualize replay log run"
946
	local subcommand="$(__git_find_on_cmdline "$subcommands")"
947 948
	if [ -z "$subcommand" ]; then
		__gitcomp "$subcommands"
949 950 951
		return
	fi

952
	case "$subcommand" in
953
	bad|good|reset|skip)
954 955 956 957 958 959 960 961
		__gitcomp "$(__git_refs)"
		;;
	*)
		COMPREPLY=()
		;;
	esac
}

962 963
_git_branch ()
{
964
	local i c=1 only_local_ref="n" has_r="n" cur words cword
965

966 967 968
	_get_comp_words_by_ref -n =: cur words cword
	while [ $c -lt $cword ]; do
		i="${words[c]}"
969 970 971 972 973 974 975
		case "$i" in
		-d|-m)	only_local_ref="y" ;;
		-r)	has_r="y" ;;
		esac
		c=$((++c))
	done

976
	case "$cur" in
S
SZEDER Gábor 已提交
977 978 979
	--*)
		__gitcomp "
			--color --no-color --verbose --abbrev= --no-abbrev
980
			--track --no-track --contains --merged --no-merged
981
			--set-upstream
S
SZEDER Gábor 已提交
982 983
			"
		;;
984 985 986 987 988 989 990
	*)
		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
			__gitcomp "$(__git_heads)"
		else
			__gitcomp "$(__git_refs)"
		fi
		;;
S
SZEDER Gábor 已提交
991
	esac
992 993
}

994 995
_git_bundle ()
{
996 997 998 999
	local words cword
	_get_comp_words_by_ref -n =: words cword
	local cmd="${words[2]}"
	case "$cword" in
1000
	2)
1001 1002
		__gitcomp "create list-heads verify unbundle"
		;;
1003
	3)
1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
		# looking for a file
		;;
	*)
		case "$cmd" in
			create)
				__git_complete_revlist
			;;
		esac
		;;
	esac
}

1016 1017
_git_checkout ()
{
1018 1019
	__git_has_doubledash && return

1020 1021
	local cur
	_get_comp_words_by_ref -n =: cur
1022 1023 1024 1025 1026 1027 1028
	case "$cur" in
	--conflict=*)
		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
		;;
	--*)
		__gitcomp "
			--quiet --ours --theirs --track --no-track --merge
1029
			--conflict= --orphan --patch
1030 1031 1032 1033 1034 1035
			"
		;;
	*)
		__gitcomp "$(__git_refs)"
		;;
	esac
1036 1037
}

1038 1039 1040 1041 1042
_git_cherry ()
{
	__gitcomp "$(__git_refs)"
}

1043 1044
_git_cherry_pick ()
{
1045 1046
	local cur
	_get_comp_words_by_ref -n =: cur
1047 1048
	case "$cur" in
	--*)
1049
		__gitcomp "--edit --no-commit"
1050 1051
		;;
	*)
1052
		__gitcomp "$(__git_refs)"
1053 1054 1055 1056
		;;
	esac
}

1057 1058 1059 1060
_git_clean ()
{
	__git_has_doubledash && return

1061 1062
	local cur
	_get_comp_words_by_ref -n =: cur
1063 1064 1065 1066 1067 1068 1069 1070 1071
	case "$cur" in
	--*)
		__gitcomp "--dry-run --quiet"
		return
		;;
	esac
	COMPREPLY=()
}

1072 1073
_git_clone ()
{
1074 1075
	local cur
	_get_comp_words_by_ref -n =: cur
1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097
	case "$cur" in
	--*)
		__gitcomp "
			--local
			--no-hardlinks
			--shared
			--reference
			--quiet
			--no-checkout
			--bare
			--mirror
			--origin
			--upload-pack
			--template=
			--depth
			"
		return
		;;
	esac
	COMPREPLY=()
}

1098 1099
_git_commit ()
{
1100 1101
	__git_has_doubledash && return

1102 1103
	local cur
	_get_comp_words_by_ref -n =: cur
1104
	case "$cur" in
1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121
	--cleanup=*)
		__gitcomp "default strip verbatim whitespace
			" "" "${cur##--cleanup=}"
		return
		;;
	--reuse-message=*)
		__gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}"
		return
		;;
	--reedit-message=*)
		__gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}"
		return
		;;
	--untracked-files=*)
		__gitcomp "all no normal" "" "${cur##--untracked-files=}"
		return
		;;
1122
	--*)
1123
		__gitcomp "
1124
			--all --author= --signoff --verify --no-verify
1125
			--edit --amend --include --only --interactive
1126 1127 1128 1129
			--dry-run --reuse-message= --reedit-message=
			--reset-author --file= --message= --template=
			--cleanup= --untracked-files --untracked-files=
			--verbose --quiet
1130
			"
1131 1132 1133 1134 1135
		return
	esac
	COMPREPLY=()
}

1136 1137
_git_describe ()
{
1138 1139
	local cur
	_get_comp_words_by_ref -n =: cur
1140 1141 1142 1143 1144 1145 1146 1147
	case "$cur" in
	--*)
		__gitcomp "
			--all --tags --contains --abbrev= --candidates=
			--exact-match --debug --long --match --always
			"
		return
	esac
1148 1149 1150
	__gitcomp "$(__git_refs)"
}

1151
__git_diff_common_options="--stat --numstat --shortstat --summary
1152 1153
			--patch-with-stat --name-only --name-status --color
			--no-color --color-words --no-renames --check
1154
			--full-index --binary --abbrev --diff-filter=
1155
			--find-copies-harder
1156 1157
			--text --ignore-space-at-eol --ignore-space-change
			--ignore-all-space --exit-code --quiet --ext-diff
1158 1159
			--no-ext-diff
			--no-prefix --src-prefix= --dst-prefix=
1160
			--inter-hunk-context=
1161
			--patience
1162
			--raw
1163 1164
			--dirstat --dirstat= --dirstat-by-file
			--dirstat-by-file= --cumulative
1165 1166 1167 1168 1169 1170
"

_git_diff ()
{
	__git_has_doubledash && return

1171 1172
	local cur
	_get_comp_words_by_ref -n =: cur
1173 1174
	case "$cur" in
	--*)
1175
		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
1176 1177
			--base --ours --theirs
			$__git_diff_common_options
1178
			"
1179 1180 1181
		return
		;;
	esac
1182 1183 1184
	__git_complete_file
}

1185
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
1186
			tkdiff vimdiff gvimdiff xxdiff araxis p4merge
1187 1188 1189 1190
"

_git_difftool ()
{
1191 1192
	__git_has_doubledash && return

1193 1194
	local cur
	_get_comp_words_by_ref -n =: cur
1195 1196 1197 1198 1199 1200
	case "$cur" in
	--tool=*)
		__gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}"
		return
		;;
	--*)
1201 1202 1203 1204 1205
		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
			--base --ours --theirs
			--no-renames --diff-filter= --find-copies-harder
			--relative --ignore-submodules
			--tool="
1206 1207 1208
		return
		;;
	esac
1209
	__git_complete_file
1210 1211
}

1212 1213
__git_fetch_options="
	--quiet --verbose --append --upload-pack --force --keep --depth=
1214
	--tags --no-tags --all --prune --dry-run
1215 1216
"

1217 1218
_git_fetch ()
{
1219 1220
	local cur
	_get_comp_words_by_ref -n =: cur
1221 1222 1223 1224 1225 1226
	case "$cur" in
	--*)
		__gitcomp "$__git_fetch_options"
		return
		;;
	esac
1227
	__git_complete_remote_or_refspec
1228 1229
}

1230 1231
_git_format_patch ()
{
1232 1233
	local cur
	_get_comp_words_by_ref -n =: cur
1234
	case "$cur" in
1235 1236 1237 1238 1239 1240
	--thread=*)
		__gitcomp "
			deep shallow
			" "" "${cur##--thread=}"
		return
		;;
1241
	--*)
1242
		__gitcomp "
1243
			--stdout --attach --no-attach --thread --thread=
1244 1245
			--output-directory
			--numbered --start-number
1246
			--numbered-files
1247
			--keep-subject
1248
			--signoff --signature --no-signature
1249
			--in-reply-to= --cc=
1250
			--full-index --binary
1251
			--not --all
1252
			--cover-letter
1253
			--no-prefix --src-prefix= --dst-prefix=
1254 1255
			--inline --suffix= --ignore-if-in-upstream
			--subject-prefix=
1256
			"
1257 1258 1259 1260 1261 1262
		return
		;;
	esac
	__git_complete_revlist
}

1263 1264
_git_fsck ()
{
1265 1266
	local cur
	_get_comp_words_by_ref -n =: cur
1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278
	case "$cur" in
	--*)
		__gitcomp "
			--tags --root --unreachable --cache --no-reflogs --full
			--strict --verbose --lost-found
			"
		return
		;;
	esac
	COMPREPLY=()
}

1279 1280
_git_gc ()
{
1281 1282
	local cur
	_get_comp_words_by_ref -n =: cur
1283 1284
	case "$cur" in
	--*)
1285
		__gitcomp "--prune --aggressive"
1286 1287 1288 1289 1290 1291
		return
		;;
	esac
	COMPREPLY=()
}

1292 1293 1294 1295 1296
_git_gitk ()
{
	_gitk
}

1297 1298 1299 1300
_git_grep ()
{
	__git_has_doubledash && return

1301 1302
	local cur
	_get_comp_words_by_ref -n =: cur
1303 1304 1305 1306 1307 1308 1309 1310 1311
	case "$cur" in
	--*)
		__gitcomp "
			--cached
			--text --ignore-case --word-regexp --invert-match
			--full-name
			--extended-regexp --basic-regexp --fixed-strings
			--files-with-matches --name-only
			--files-without-match
1312
			--max-depth
1313 1314 1315 1316 1317 1318
			--count
			--and --or --not --all-match
			"
		return
		;;
	esac
1319 1320

	__gitcomp "$(__git_refs)"
1321 1322
}

1323 1324
_git_help ()
{
1325 1326
	local cur
	_get_comp_words_by_ref -n =: cur
1327 1328 1329 1330 1331 1332
	case "$cur" in
	--*)
		__gitcomp "--all --info --man --web"
		return
		;;
	esac
J
Jonathan Nieder 已提交
1333 1334
	__git_compute_all_commands
	__gitcomp "$__git_all_commands
1335 1336 1337
		attributes cli core-tutorial cvs-migration
		diffcore gitk glossary hooks ignore modules
		repository-layout tutorial tutorial-2
1338
		workflows
1339
		"
1340 1341
}

1342 1343
_git_init ()
{
1344 1345
	local cur
	_get_comp_words_by_ref -n =: cur
1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360
	case "$cur" in
	--shared=*)
		__gitcomp "
			false true umask group all world everybody
			" "" "${cur##--shared=}"
		return
		;;
	--*)
		__gitcomp "--quiet --bare --template= --shared --shared="
		return
		;;
	esac
	COMPREPLY=()
}

1361 1362 1363 1364
_git_ls_files ()
{
	__git_has_doubledash && return

1365 1366
	local cur
	_get_comp_words_by_ref -n =: cur
1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381
	case "$cur" in
	--*)
		__gitcomp "--cached --deleted --modified --others --ignored
			--stage --directory --no-empty-directory --unmerged
			--killed --exclude= --exclude-from=
			--exclude-per-directory= --exclude-standard
			--error-unmatch --with-tree= --full-name
			--abbrev --ignored --exclude-per-directory
			"
		return
		;;
	esac
	COMPREPLY=()
}

1382 1383
_git_ls_remote ()
{
1384
	__gitcomp "$(__git_remotes)"
1385 1386 1387 1388 1389 1390 1391
}

_git_ls_tree ()
{
	__git_complete_file
}

1392 1393 1394 1395
# Options that go well for log, shortlog and gitk
__git_log_common_options="
	--not --all
	--branches --tags --remotes
1396
	--first-parent --merges --no-merges
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412
	--max-count=
	--max-age= --since= --after=
	--min-age= --until= --before=
"
# 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
"
# Options that go well for log and shortlog (not gitk)
__git_log_shortlog_options="
	--author= --committer= --grep=
	--all-match
"

1413
__git_log_pretty_formats="oneline short medium full fuller email raw format:"
1414
__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
1415

1416 1417
_git_log ()
{
1418 1419
	__git_has_doubledash && return

1420 1421
	local g="$(git rev-parse --git-dir 2>/dev/null)"
	local merge=""
1422
	if [ -f "$g/MERGE_HEAD" ]; then
1423 1424
		merge="--merge"
	fi
1425 1426
	local cur
	_get_comp_words_by_ref -n =: cur
1427 1428
	case "$cur" in
	--pretty=*)
1429
		__gitcomp "$__git_log_pretty_formats
1430
			" "" "${cur##--pretty=}"
1431 1432
		return
		;;
1433 1434 1435 1436 1437
	--format=*)
		__gitcomp "$__git_log_pretty_formats
			" "" "${cur##--format=}"
		return
		;;
1438
	--date=*)
1439
		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
1440 1441
		return
		;;
1442 1443 1444 1445
	--decorate=*)
		__gitcomp "long short" "" "${cur##--decorate=}"
		return
		;;
1446
	--*)
1447
		__gitcomp "
1448 1449 1450
			$__git_log_common_options
			$__git_log_shortlog_options
			$__git_log_gitk_options
1451
			--root --topo-order --date-order --reverse
1452
			--follow --full-diff
1453
			--abbrev-commit --abbrev=
1454
			--relative-date --date=
1455
			--pretty= --format= --oneline
1456
			--cherry-pick
1457
			--graph
1458
			--decorate --decorate=
1459
			--walk-reflogs
1460
			--parents --children
1461
			$merge
1462
			$__git_diff_common_options
1463
			--pickaxe-all --pickaxe-regex
1464
			"
1465 1466 1467
		return
		;;
	esac
1468
	__git_complete_revlist
1469 1470
}

1471 1472
__git_merge_options="
	--no-commit --no-stat --log --no-log --squash --strategy
1473
	--commit --stat --no-squash --ff --no-ff --ff-only
1474 1475
"

1476 1477
_git_merge ()
{
1478 1479
	__git_complete_strategy && return

1480 1481
	local cur
	_get_comp_words_by_ref -n =: cur
1482 1483
	case "$cur" in
	--*)
1484
		__gitcomp "$__git_merge_options"
1485 1486
		return
	esac
1487
	__gitcomp "$(__git_refs)"
1488 1489
}

1490 1491
_git_mergetool ()
{
1492 1493
	local cur
	_get_comp_words_by_ref -n =: cur
1494 1495
	case "$cur" in
	--tool=*)
1496
		__gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}"
1497 1498 1499 1500 1501 1502 1503 1504 1505 1506
		return
		;;
	--*)
		__gitcomp "--tool="
		return
		;;
	esac
	COMPREPLY=()
}

1507 1508
_git_merge_base ()
{
1509
	__gitcomp "$(__git_refs)"
1510 1511
}

1512 1513
_git_mv ()
{
1514 1515
	local cur
	_get_comp_words_by_ref -n =: cur
1516 1517 1518 1519 1520 1521 1522 1523 1524
	case "$cur" in
	--*)
		__gitcomp "--dry-run"
		return
		;;
	esac
	COMPREPLY=()
}

1525 1526
_git_name_rev ()
{
1527
	__gitcomp "--tags --all --stdin"
1528 1529
}

1530 1531 1532
_git_notes ()
{
	local subcommands="edit show"
1533 1534
	local words cword
	_get_comp_words_by_ref -n =: words cword
1535 1536 1537 1538 1539
	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
		__gitcomp "$subcommands"
		return
	fi

1540
	case "${words[cword-1]}" in
1541 1542 1543 1544 1545 1546 1547 1548 1549
	-m|-F)
		COMPREPLY=()
		;;
	*)
		__gitcomp "$(__git_refs)"
		;;
	esac
}

1550 1551
_git_pull ()
{
1552 1553
	__git_complete_strategy && return

1554 1555
	local cur
	_get_comp_words_by_ref -n =: cur
1556 1557 1558 1559 1560 1561 1562 1563 1564 1565
	case "$cur" in
	--*)
		__gitcomp "
			--rebase --no-rebase
			$__git_merge_options
			$__git_fetch_options
		"
		return
		;;
	esac
1566
	__git_complete_remote_or_refspec
1567 1568 1569 1570
}

_git_push ()
{
1571 1572 1573
	local cur prev
	_get_comp_words_by_ref -n =: cur prev
	case "$prev" in
1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590
	--repo)
		__gitcomp "$(__git_remotes)"
		return
	esac
	case "$cur" in
	--repo=*)
		__gitcomp "$(__git_remotes)" "" "${cur##--repo=}"
		return
		;;
	--*)
		__gitcomp "
			--all --mirror --tags --dry-run --force --verbose
			--receive-pack= --repo=
		"
		return
		;;
	esac
1591
	__git_complete_remote_or_refspec
1592 1593
}

1594 1595
_git_rebase ()
{
1596 1597 1598
	local dir="$(__gitdir)"
	local cur
	_get_comp_words_by_ref -n =: cur
1599
	if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
1600
		__gitcomp "--continue --skip --abort"
1601 1602
		return
	fi
1603
	__git_complete_strategy && return
1604
	case "$cur" in
1605 1606 1607 1608
	--whitespace=*)
		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
		return
		;;
1609
	--*)
1610 1611 1612 1613 1614
		__gitcomp "
			--onto --merge --strategy --interactive
			--preserve-merges --stat --no-stat
			--committer-date-is-author-date --ignore-date
			--ignore-whitespace --whitespace=
1615
			--autosquash
1616 1617
			"

1618 1619
		return
	esac
1620
	__gitcomp "$(__git_refs)"
1621 1622
}

1623
__git_send_email_confirm_options="always never auto cc compose"
1624
__git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
1625

1626 1627
_git_send_email ()
{
1628 1629
	local cur
	_get_comp_words_by_ref -n =: cur
1630
	case "$cur" in
1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647
	--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
		;;
1648
	--*)
1649
		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
1650 1651
			--compose --confirm= --dry-run --envelope-sender
			--from --identity
1652 1653 1654
			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
			--no-suppress-from --no-thread --quiet
			--signed-off-by-cc --smtp-pass --smtp-server
1655 1656
			--smtp-server-port --smtp-encryption= --smtp-user
			--subject --suppress-cc= --suppress-from --thread --to
1657
			--validate --no-validate"
1658 1659 1660 1661 1662 1663
		return
		;;
	esac
	COMPREPLY=()
}

1664 1665 1666 1667 1668
_git_stage ()
{
	_git_add
}

1669 1670
__git_config_get_set_variables ()
{
1671 1672 1673
	local words cword
	_get_comp_words_by_ref -n =: words cword
	local prevword word config_file= c=$cword
1674
	while [ $c -gt 1 ]; do
1675
		word="${words[c]}"
1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689
		case "$word" in
		--global|--system|--file=*)
			config_file="$word"
			break
			;;
		-f|--file)
			config_file="$word $prevword"
			break
			;;
		esac
		prevword=$word
		c=$((--c))
	done

1690 1691 1692 1693 1694 1695
	git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
	while read line
	do
		case "$line" in
		*.*=*)
			echo "${line/=*/}"
1696 1697 1698 1699 1700
			;;
		esac
	done
}

1701
_git_config ()
1702
{
1703 1704 1705
	local cur prev
	_get_comp_words_by_ref -n =: cur prev
	case "$prev" in
1706
	branch.*.remote)
1707
		__gitcomp "$(__git_remotes)"
1708 1709 1710
		return
		;;
	branch.*.merge)
1711
		__gitcomp "$(__git_refs)"
1712 1713 1714
		return
		;;
	remote.*.fetch)
1715
		local remote="${prev#remote.}"
1716
		remote="${remote%.fetch}"
1717
		__gitcomp "$(__git_refs_remotes "$remote")"
1718 1719 1720
		return
		;;
	remote.*.push)
1721
		local remote="${prev#remote.}"
1722
		remote="${remote%.push}"
1723
		__gitcomp "$(git --git-dir="$(__gitdir)" \
1724
			for-each-ref --format='%(refname):%(refname)' \
1725 1726 1727 1728
			refs/heads)"
		return
		;;
	pull.twohead|pull.octopus)
J
Jonathan Nieder 已提交
1729 1730
		__git_compute_merge_strategies
		__gitcomp "$__git_merge_strategies"
1731 1732
		return
		;;
1733 1734
	color.branch|color.diff|color.interactive|\
	color.showbranch|color.status|color.ui)
1735 1736 1737
		__gitcomp "always never auto"
		return
		;;
1738 1739 1740 1741
	color.pager)
		__gitcomp "false true"
		return
		;;
1742 1743
	color.*.*)
		__gitcomp "
1744
			normal black red green yellow blue magenta cyan white
1745 1746
			bold dim ul blink reverse
			"
1747 1748
		return
		;;
1749 1750 1751 1752
	help.format)
		__gitcomp "man info web html"
		return
		;;
1753 1754 1755 1756
	log.date)
		__gitcomp "$__git_log_date_formats"
		return
		;;
1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768
	sendemail.aliasesfiletype)
		__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
		;;
1769 1770 1771 1772
	--get|--get-all|--unset|--unset-all)
		__gitcomp "$(__git_config_get_set_variables)"
		return
		;;
1773 1774 1775 1776 1777 1778 1779
	*.*)
		COMPREPLY=()
		return
		;;
	esac
	case "$cur" in
	--*)
1780
		__gitcomp "
1781
			--global --system --file=
1782
			--list --replace-all
1783
			--get --get-all --get-regexp
1784
			--add --unset --unset-all
1785
			--remove-section --rename-section
1786
			"
1787 1788 1789 1790 1791
		return
		;;
	branch.*.*)
		local pfx="${cur%.*}."
		cur="${cur##*.}"
1792
		__gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur"
1793 1794 1795 1796 1797
		return
		;;
	branch.*)
		local pfx="${cur%.*}."
		cur="${cur#*.}"
1798
		__gitcomp "$(__git_heads)" "$pfx" "$cur" "."
1799 1800
		return
		;;
1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830
	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#*.}"
J
Jonathan Nieder 已提交
1831 1832
		__git_compute_all_commands
		__gitcomp "$__git_all_commands" "$pfx" "$cur"
1833 1834
		return
		;;
1835 1836 1837
	remote.*.*)
		local pfx="${cur%.*}."
		cur="${cur##*.}"
1838
		__gitcomp "
1839
			url proxy fetch push mirror skipDefaultUpdate
1840
			receivepack uploadpack tagopt pushurl
1841
			" "$pfx" "$cur"
1842 1843 1844 1845 1846
		return
		;;
	remote.*)
		local pfx="${cur%.*}."
		cur="${cur#*.}"
1847
		__gitcomp "$(__git_remotes)" "$pfx" "$cur" "."
1848 1849
		return
		;;
1850 1851 1852
	url.*.*)
		local pfx="${cur%.*}."
		cur="${cur##*.}"
1853
		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur"
1854 1855
		return
		;;
1856
	esac
1857
	__gitcomp "
1858
		add.ignore-errors
1859
		alias.
1860
		apply.ignorewhitespace
1861
		apply.whitespace
1862 1863
		branch.autosetupmerge
		branch.autosetuprebase
1864
		clean.requireForce
1865 1866 1867 1868
		color.branch
		color.branch.current
		color.branch.local
		color.branch.plain
1869
		color.branch.remote
1870
		color.diff
1871
		color.diff.commit
1872
		color.diff.frag
1873
		color.diff.meta
1874
		color.diff.new
1875 1876
		color.diff.old
		color.diff.plain
1877
		color.diff.whitespace
1878 1879 1880
		color.grep
		color.grep.external
		color.grep.match
1881 1882 1883 1884
		color.interactive
		color.interactive.header
		color.interactive.help
		color.interactive.prompt
1885
		color.pager
1886
		color.showbranch
1887
		color.status
1888 1889
		color.status.added
		color.status.changed
1890
		color.status.header
1891
		color.status.nobranch
1892
		color.status.untracked
1893 1894 1895 1896 1897
		color.status.updated
		color.ui
		commit.template
		core.autocrlf
		core.bare
1898
		core.compression
1899
		core.createObject
1900 1901 1902
		core.deltaBaseCacheLimit
		core.editor
		core.excludesfile
1903
		core.fileMode
1904
		core.fsyncobjectfiles
1905
		core.gitProxy
1906
		core.ignoreCygwinFSTricks
1907 1908 1909 1910 1911
		core.ignoreStat
		core.logAllRefUpdates
		core.loosecompression
		core.packedGitLimit
		core.packedGitWindowSize
1912
		core.pager
1913
		core.preferSymlinkRefs
1914 1915
		core.preloadindex
		core.quotepath
1916
		core.repositoryFormatVersion
1917
		core.safecrlf
1918
		core.sharedRepository
1919 1920
		core.symlinks
		core.trustctime
1921
		core.warnAmbiguousRefs
1922 1923 1924 1925 1926
		core.whitespace
		core.worktree
		diff.autorefreshindex
		diff.external
		diff.mnemonicprefix
1927
		diff.renameLimit
1928
		diff.renameLimit.
1929
		diff.renames
1930 1931 1932
		diff.suppressBlankEmpty
		diff.tool
		diff.wordRegex
1933
		difftool.
1934
		difftool.prompt
1935
		fetch.unpackLimit
1936 1937
		format.attach
		format.cc
1938
		format.headers
1939 1940
		format.numbered
		format.pretty
1941
		format.signature
1942 1943
		format.signoff
		format.subjectprefix
1944
		format.suffix
1945
		format.thread
1946 1947 1948
		gc.aggressiveWindow
		gc.auto
		gc.autopacklimit
1949
		gc.packrefs
1950
		gc.pruneexpire
1951 1952 1953 1954
		gc.reflogexpire
		gc.reflogexpireunreachable
		gc.rerereresolved
		gc.rerereunresolved
1955
		gitcvs.allbinary
1956
		gitcvs.commitmsgannotation
1957
		gitcvs.dbTableNamePrefix
1958 1959 1960 1961 1962 1963
		gitcvs.dbdriver
		gitcvs.dbname
		gitcvs.dbpass
		gitcvs.dbuser
		gitcvs.enabled
		gitcvs.logfile
1964
		gitcvs.usecrlfattr
1965
		guitool.
1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979
		gui.blamehistoryctx
		gui.commitmsgwidth
		gui.copyblamethreshold
		gui.diffcontext
		gui.encoding
		gui.fastcopyblame
		gui.matchtrackingbranch
		gui.newbranchtemplate
		gui.pruneduringfetch
		gui.spellingdictionary
		gui.trustmtime
		help.autocorrect
		help.browser
		help.format
1980 1981
		http.lowSpeedLimit
		http.lowSpeedTime
1982
		http.maxRequests
1983
		http.noEPSV
1984
		http.proxy
1985 1986 1987 1988 1989
		http.sslCAInfo
		http.sslCAPath
		http.sslCert
		http.sslKey
		http.sslVerify
1990 1991
		i18n.commitEncoding
		i18n.logOutputEncoding
1992 1993 1994 1995 1996 1997 1998 1999
		imap.folder
		imap.host
		imap.pass
		imap.port
		imap.preformattedHTML
		imap.sslverify
		imap.tunnel
		imap.user
2000 2001 2002 2003 2004
		instaweb.browser
		instaweb.httpd
		instaweb.local
		instaweb.modulepath
		instaweb.port
2005
		interactive.singlekey
2006
		log.date
2007
		log.showroot
2008
		mailmap.file
2009
		man.
2010 2011 2012 2013 2014
		man.viewer
		merge.conflictstyle
		merge.log
		merge.renameLimit
		merge.stat
2015
		merge.tool
2016
		merge.verbosity
2017
		mergetool.
2018
		mergetool.keepBackup
2019
		mergetool.prompt
2020 2021
		pack.compression
		pack.deltaCacheLimit
2022 2023
		pack.deltaCacheSize
		pack.depth
2024 2025 2026
		pack.indexVersion
		pack.packSizeLimit
		pack.threads
2027 2028
		pack.window
		pack.windowMemory
2029
		pager.
2030 2031
		pull.octopus
		pull.twohead
2032 2033
		push.default
		rebase.stat
2034 2035
		receive.denyCurrentBranch
		receive.denyDeletes
2036
		receive.denyNonFastForwards
2037
		receive.fsckObjects
2038
		receive.unpackLimit
2039 2040 2041
		repack.usedeltabaseoffset
		rerere.autoupdate
		rerere.enabled
2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061
		sendemail.aliasesfile
		sendemail.aliasesfiletype
		sendemail.bcc
		sendemail.cc
		sendemail.cccmd
		sendemail.chainreplyto
		sendemail.confirm
		sendemail.envelopesender
		sendemail.multiedit
		sendemail.signedoffbycc
		sendemail.smtpencryption
		sendemail.smtppass
		sendemail.smtpserver
		sendemail.smtpserverport
		sendemail.smtpuser
		sendemail.suppresscc
		sendemail.suppressfrom
		sendemail.thread
		sendemail.to
		sendemail.validate
2062
		showbranch.default
2063 2064
		status.relativePaths
		status.showUntrackedFiles
2065 2066
		tar.umask
		transfer.unpackLimit
2067
		url.
2068
		user.email
2069
		user.name
2070
		user.signingkey
2071
		web.browser
2072
		branch. remote.
2073
	"
2074 2075
}

2076 2077
_git_remote ()
{
2078
	local subcommands="add rename rm show prune update set-head"
2079
	local subcommand="$(__git_find_on_cmdline "$subcommands")"
2080
	if [ -z "$subcommand" ]; then
2081
		__gitcomp "$subcommands"
2082 2083 2084
		return
	fi

2085
	case "$subcommand" in
2086
	rename|rm|show|prune)
2087 2088
		__gitcomp "$(__git_remotes)"
		;;
2089 2090
	update)
		local i c='' IFS=$'\n'
2091 2092 2093
		for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do
			i="${i#remotes.}"
			c="$c ${i/ */}"
2094 2095 2096
		done
		__gitcomp "$c"
		;;
2097 2098 2099 2100 2101 2102
	*)
		COMPREPLY=()
		;;
	esac
}

2103 2104 2105 2106 2107
_git_replace ()
{
	__gitcomp "$(__git_refs)"
}

2108 2109
_git_reset ()
{
2110 2111
	__git_has_doubledash && return

2112 2113
	local cur
	_get_comp_words_by_ref -n =: cur
2114 2115
	case "$cur" in
	--*)
S
SZEDER Gábor 已提交
2116
		__gitcomp "--merge --mixed --hard --soft --patch"
2117 2118 2119 2120
		return
		;;
	esac
	__gitcomp "$(__git_refs)"
2121 2122
}

2123 2124
_git_revert ()
{
2125 2126
	local cur
	_get_comp_words_by_ref -n =: cur
2127 2128 2129 2130 2131 2132
	case "$cur" in
	--*)
		__gitcomp "--edit --mainline --no-edit --no-commit --signoff"
		return
		;;
	esac
2133
	__gitcomp "$(__git_refs)"
2134 2135
}

2136 2137 2138 2139
_git_rm ()
{
	__git_has_doubledash && return

2140 2141
	local cur
	_get_comp_words_by_ref -n =: cur
2142 2143 2144 2145 2146 2147 2148 2149 2150
	case "$cur" in
	--*)
		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
		return
		;;
	esac
	COMPREPLY=()
}

2151 2152
_git_shortlog ()
{
2153 2154
	__git_has_doubledash && return

2155 2156
	local cur
	_get_comp_words_by_ref -n =: cur
2157 2158 2159
	case "$cur" in
	--*)
		__gitcomp "
2160 2161
			$__git_log_common_options
			$__git_log_shortlog_options
2162 2163 2164 2165 2166 2167 2168 2169
			--numbered --summary
			"
		return
		;;
	esac
	__git_complete_revlist
}

2170 2171
_git_show ()
{
2172 2173
	__git_has_doubledash && return

2174 2175
	local cur
	_get_comp_words_by_ref -n =: cur
2176 2177
	case "$cur" in
	--pretty=*)
2178
		__gitcomp "$__git_log_pretty_formats
2179
			" "" "${cur##--pretty=}"
2180 2181
		return
		;;
2182 2183 2184 2185 2186
	--format=*)
		__gitcomp "$__git_log_pretty_formats
			" "" "${cur##--format=}"
		return
		;;
2187
	--*)
2188
		__gitcomp "--pretty= --format= --abbrev-commit --oneline
2189 2190
			$__git_diff_common_options
			"
2191 2192 2193 2194 2195 2196
		return
		;;
	esac
	__git_complete_file
}

2197 2198
_git_show_branch ()
{
2199 2200
	local cur
	_get_comp_words_by_ref -n =: cur
2201 2202 2203 2204 2205
	case "$cur" in
	--*)
		__gitcomp "
			--all --remotes --topo-order --current --more=
			--list --independent --merge-base --no-name
2206
			--color --no-color
2207
			--sha1-name --sparse --topics --reflog
2208 2209 2210 2211 2212 2213 2214
			"
		return
		;;
	esac
	__git_complete_revlist
}

J
Junio C Hamano 已提交
2215 2216
_git_stash ()
{
2217 2218
	local cur
	_get_comp_words_by_ref -n =: cur
2219
	local save_opts='--keep-index --no-keep-index --quiet --patch'
2220
	local subcommands='save list show apply clear drop pop create branch'
2221
	local subcommand="$(__git_find_on_cmdline "$subcommands")"
2222
	if [ -z "$subcommand" ]; then
2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234
		case "$cur" in
		--*)
			__gitcomp "$save_opts"
			;;
		*)
			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
				__gitcomp "$subcommands"
			else
				COMPREPLY=()
			fi
			;;
		esac
2235 2236 2237
	else
		case "$subcommand,$cur" in
		save,--*)
2238
			__gitcomp "$save_opts"
2239
			;;
2240
		apply,--*|pop,--*)
2241
			__gitcomp "--index --quiet"
2242
			;;
2243
		show,--*|drop,--*|branch,--*)
2244 2245 2246 2247 2248 2249
			COMPREPLY=()
			;;
		show,*|apply,*|drop,*|pop,*|branch,*)
			__gitcomp "$(git --git-dir="$(__gitdir)" stash list \
					| sed -n -e 's/:.*//p')"
			;;
2250 2251 2252 2253
		*)
			COMPREPLY=()
			;;
		esac
2254
	fi
J
Junio C Hamano 已提交
2255 2256
}

2257 2258
_git_submodule ()
{
2259 2260
	__git_has_doubledash && return

2261
	local subcommands="add status init update summary foreach sync"
2262
	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
2263 2264
		local cur
		_get_comp_words_by_ref -n =: cur
2265 2266 2267 2268 2269
		case "$cur" in
		--*)
			__gitcomp "--quiet --cached"
			;;
		*)
2270
			__gitcomp "$subcommands"
2271 2272 2273 2274 2275 2276
			;;
		esac
		return
	fi
}

2277 2278 2279 2280 2281
_git_svn ()
{
	local subcommands="
		init fetch clone rebase dcommit log find-rev
		set-tree commit-diff info create-ignore propget
S
SZEDER Gábor 已提交
2282
		proplist show-ignore show-externals branch tag blame
2283
		migrate mkdirs reset gc
2284
		"
2285
	local subcommand="$(__git_find_on_cmdline "$subcommands")"
2286 2287 2288 2289 2290 2291 2292 2293
	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
S
SZEDER Gábor 已提交
2294 2295
			--repack-flags --use-log-author --localtime
			--ignore-paths= $remote_opts
2296 2297 2298 2299 2300
			"
		local init_opts="
			--template= --shared= --trunk= --tags=
			--branches= --stdlayout --minimize-url
			--no-metadata --use-svm-props --use-svnsync-props
S
SZEDER Gábor 已提交
2301 2302
			--rewrite-root= --prefix= --use-log-author
			--add-author-from $remote_opts
2303 2304 2305 2306 2307
			"
		local cmt_opts="
			--edit --rmdir --find-copies-harder --copy-similarity=
			"

2308 2309
		local cur
		_get_comp_words_by_ref -n =: cur
2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322
		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
S
SZEDER Gábor 已提交
2323 2324
				--fetch-all --no-rebase --commit-url
				--revision $cmt_opts $fc_opts
2325 2326 2327 2328 2329 2330
				"
			;;
		set-tree,--*)
			__gitcomp "--stdin $cmt_opts $fc_opts"
			;;
		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
2331
		show-externals,--*|mkdirs,--*)
2332 2333 2334 2335 2336 2337
			__gitcomp "--revision="
			;;
		log,--*)
			__gitcomp "
				--limit= --revision= --verbose --incremental
				--oneline --show-commit --non-recursive
S
SZEDER Gábor 已提交
2338
				--authors-file= --color
2339 2340 2341 2342 2343
				"
			;;
		rebase,--*)
			__gitcomp "
				--merge --verbose --strategy= --local
S
SZEDER Gábor 已提交
2344
				--fetch-all --dry-run $fc_opts
2345 2346 2347 2348 2349 2350 2351 2352
				"
			;;
		commit-diff,--*)
			__gitcomp "--message= --file= --revision= $cmt_opts"
			;;
		info,--*)
			__gitcomp "--url"
			;;
S
SZEDER Gábor 已提交
2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367
		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=
				"
			;;
2368 2369 2370
		reset,--*)
			__gitcomp "--revision= --parent"
			;;
2371 2372 2373 2374 2375 2376 2377
		*)
			COMPREPLY=()
			;;
		esac
	fi
}

2378 2379 2380
_git_tag ()
{
	local i c=1 f=0
2381 2382 2383 2384
	local words cword prev
	_get_comp_words_by_ref -n =: words cword prev
	while [ $c -lt $cword ]; do
		i="${words[c]}"
2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396
		case "$i" in
		-d|-v)
			__gitcomp "$(__git_tags)"
			return
			;;
		-f)
			f=1
			;;
		esac
		c=$((++c))
	done

2397
	case "$prev" in
2398 2399 2400
	-m|-F)
		COMPREPLY=()
		;;
2401
	-*|tag)
2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413
		if [ $f = 1 ]; then
			__gitcomp "$(__git_tags)"
		else
			COMPREPLY=()
		fi
		;;
	*)
		__gitcomp "$(__git_refs)"
		;;
	esac
}

2414 2415 2416 2417 2418
_git_whatchanged ()
{
	_git_log
}

2419 2420
_git ()
{
2421 2422
	local i c=1 command __git_dir

2423 2424 2425 2426
	local cur words cword
	_get_comp_words_by_ref -n =: cur words cword
	while [ $c -lt $cword ]; do
		i="${words[c]}"
2427 2428 2429
		case "$i" in
		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
		--bare)      __git_dir="." ;;
2430 2431
		--version|-p|--paginate) ;;
		--help) command="help"; break ;;
2432 2433 2434 2435 2436
		*) command="$i"; break ;;
		esac
		c=$((++c))
	done

2437
	if [ -z "$command" ]; then
2438
		case "$cur" in
2439
		--*)   __gitcomp "
2440
			--paginate
2441 2442 2443 2444 2445
			--no-pager
			--git-dir=
			--bare
			--version
			--exec-path
2446
			--html-path
2447 2448
			--work-tree=
			--help
2449 2450
			"
			;;
J
Jonathan Nieder 已提交
2451 2452
		*)     __git_compute_porcelain_commands
		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
2453 2454
		esac
		return
2455
	fi
2456

2457
	local completion_func="_git_${command//-/_}"
2458 2459
	declare -F $completion_func >/dev/null && $completion_func && return

2460
	local expansion=$(__git_aliased_command "$command")
2461 2462 2463 2464
	if [ -n "$expansion" ]; then
		completion_func="_git_${expansion//-/_}"
		declare -F $completion_func >/dev/null && $completion_func
	fi
2465 2466 2467 2468
}

_gitk ()
{
2469 2470
	__git_has_doubledash && return

2471
	local cur
2472
	local g="$(__gitdir)"
2473
	local merge=""
2474
	if [ -f "$g/MERGE_HEAD" ]; then
2475 2476
		merge="--merge"
	fi
2477
	_get_comp_words_by_ref -n =: cur
2478 2479
	case "$cur" in
	--*)
2480 2481 2482 2483 2484
		__gitcomp "
			$__git_log_common_options
			$__git_log_gitk_options
			$merge
			"
2485 2486 2487
		return
		;;
	esac
2488
	__git_complete_revlist
2489 2490
}

2491 2492 2493 2494
complete -o bashdefault -o default -o nospace -F _git git 2>/dev/null \
	|| complete -o default -o nospace -F _git git
complete -o bashdefault -o default -o nospace -F _gitk gitk 2>/dev/null \
	|| complete -o default -o nospace -F _gitk gitk
2495 2496 2497 2498 2499

# 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.
#
2500
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
2501 2502
complete -o bashdefault -o default -o nospace -F _git git.exe 2>/dev/null \
	|| complete -o default -o nospace -F _git git.exe
2503
fi