From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Feb 2012 21:26:04 +0000 (-0800)
Subject: Merge branch 'pj/completion-remote-set-url-branches'
X-Git-Tag: v1.7.10-rc0~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/472fdee793e6d4185b91bf62b2d601009bb32b24?ds=inline;hp=-c

Merge branch 'pj/completion-remote-set-url-branches'

* pj/completion-remote-set-url-branches:
completion: normalize increment/decrement style
completion: remote set-* <name> and <branch>
---

472fdee793e6d4185b91bf62b2d601009bb32b24
diff --combined contrib/completion/git-completion.bash
index 554e30e961,03f0b8c195..33f0e4dd69
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -137,7 -137,7 +137,7 @@@ __git_ps1_show_upstream (
  			svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
  			svn_upstream=${svn_upstream%@*}
  			local n_stop="${#svn_remote[@]}"
- 			for ((n=1; n <= n_stop; ++n)); do
+ 			for ((n=1; n <= n_stop; n++)); do
  				svn_upstream=${svn_upstream#${svn_remote[$n]}}
  			done
  
@@@ -166,10 -166,8 +166,8 @@@
  			for commit in $commits
  			do
  				case "$commit" in
- 				"<"*) let ++behind
- 					;;
- 				*)    let ++ahead
- 					;;
+ 				"<"*) ((behind++)) ;;
+ 				*)    ((ahead++))  ;;
  				esac
  			done
  			count="$behind	$ahead"
@@@ -726,6 -724,9 +724,9 @@@ __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
@@@ -743,7 -744,7 +744,7 @@@
  		-*) ;;
  		*) remote="$i"; break ;;
  		esac
- 		c=$((++c))
+ 		((c++))
  	done
  	if [ -z "$remote" ]; then
  		__gitcomp_nl "$(__git_remotes)"
@@@ -776,7 -777,7 +777,7 @@@
  			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
  		fi
  		;;
- 	pull)
+ 	pull|remote)
  		if [ $lhs = 1 ]; then
  			__gitcomp_nl "$(__git_refs "$remote")" "$pfx" "$cur_"
  		else
@@@ -983,7 -984,7 +984,7 @@@ __git_find_on_cmdline (
  				return
  			fi
  		done
- 		c=$((++c))
+ 		((c++))
  	done
  }
  
@@@ -994,7 -995,7 +995,7 @@@ __git_has_doubledash (
  		if [ "--" = "${words[c]}" ]; then
  			return 0
  		fi
- 		c=$((++c))
+ 		((c++))
  	done
  	return 1
  }
@@@ -1117,7 -1118,7 +1118,7 @@@ _git_branch (
  		-d|-m)	only_local_ref="y" ;;
  		-r)	has_r="y" ;;
  		esac
- 		c=$((++c))
+ 		((c++))
  	done
  
  	case "$cur" in
@@@ -2277,7 -2278,7 +2278,7 @@@ _git_config (
  
  _git_remote ()
  {
- 	local subcommands="add rename rm show prune update set-head"
+ 	local subcommands="add rename rm set-head set-branches set-url show prune update"
  	local subcommand="$(__git_find_on_cmdline "$subcommands")"
  	if [ -z "$subcommand" ]; then
  		__gitcomp "$subcommands"
@@@ -2285,9 -2286,12 +2286,12 @@@
  	fi
  
  	case "$subcommand" in
- 	rename|rm|show|prune)
+ 	rename|rm|set-url|show|prune)
  		__gitcomp_nl "$(__git_remotes)"
  		;;
+ 	set-head|set-branches)
+ 		__git_complete_remote_or_refspec
+ 		;;
  	update)
  		local i c='' IFS=$'\n'
  		for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do
@@@ -2500,7 -2504,7 +2504,7 @@@ _git_svn (
  			__gitcomp "
  				--merge --strategy= --verbose --dry-run
  				--fetch-all --no-rebase --commit-url
 -				--revision $cmt_opts $fc_opts
 +				--revision --interactive $cmt_opts $fc_opts
  				"
  			;;
  		set-tree,--*)
@@@ -2568,7 -2572,7 +2572,7 @@@ _git_tag (
  			f=1
  			;;
  		esac
- 		c=$((++c))
+ 		((c++))
  	done
  
  	case "$prev" in
@@@ -2621,7 -2625,7 +2625,7 @@@ _git (
  		--help) command="help"; break ;;
  		*) command="$i"; break ;;
  		esac
- 		c=$((++c))
+ 		((c++))
  	done
  
  	if [ -z "$command" ]; then