From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2014 17:08:03 +0000 (-0700)
Subject: Merge branch 'oc/mergetools-beyondcompare'
X-Git-Tag: v2.2.0-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1777a297043a06d6c18d383d17447f5eefcdcbe?ds=inline;hp=-c

Merge branch 'oc/mergetools-beyondcompare'

* oc/mergetools-beyondcompare:
mergetool: rename bc3 to bc
---

c1777a297043a06d6c18d383d17447f5eefcdcbe
diff --combined contrib/completion/git-completion.bash
index 8704451e52,8a19b3e3fd..2fece98c60
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -281,12 -281,16 +281,12 @@@ __gitcomp_file (
  # argument, and using the options specified in the second argument.
  __git_ls_files_helper ()
  {
 -	(
 -		test -n "${CDPATH+set}" && unset CDPATH
 -		cd "$1"
 -		if [ "$2" == "--committable" ]; then
 -			git diff-index --name-only --relative HEAD
 -		else
 -			# NOTE: $2 is not quoted in order to support multiple options
 -			git ls-files --exclude-standard $2
 -		fi
 -	) 2>/dev/null
 +	if [ "$2" == "--committable" ]; then
 +		git -C "$1" diff-index --name-only --relative HEAD
 +	else
 +		# NOTE: $2 is not quoted in order to support multiple options
 +		git -C "$1" ls-files --exclude-standard $2
 +	fi 2>/dev/null
  }
  
  
@@@ -384,8 -388,7 +384,8 @@@ __git_refs (
  		;;
  	*)
  		echo "HEAD"
 -		git for-each-ref --format="%(refname:short)" -- "refs/remotes/$dir/" | sed -e "s#^$dir/##"
 +		git for-each-ref --format="%(refname:short)" -- \
 +			"refs/remotes/$dir/" 2>/dev/null | sed -e "s#^$dir/##"
  		;;
  	esac
  }
@@@ -519,7 -522,7 +519,7 @@@ __git_complete_index_file (
  		;;
  	esac
  
 -	__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
 +	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
  }
  
  __git_complete_file ()
@@@ -1172,8 -1175,8 +1172,8 @@@ __git_diff_common_options="--stat --num
  			--full-index --binary --abbrev --diff-filter=
  			--find-copies-harder
  			--text --ignore-space-at-eol --ignore-space-change
 -			--ignore-all-space --exit-code --quiet --ext-diff
 -			--no-ext-diff
 +			--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
@@@ -1204,7 -1207,7 +1204,7 @@@ _git_diff (
  }
  
  __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
- 			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
+ 			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
  "
  
  _git_difftool ()
@@@ -1464,7 -1467,6 +1464,7 @@@ _git_log (
  			--abbrev-commit --abbrev=
  			--relative-date --date=
  			--pretty= --format= --oneline
 +			--show-signature
  			--cherry-pick
  			--graph
  			--decorate --decorate=
@@@ -2342,7 -2344,6 +2342,7 @@@ _git_show (
  		;;
  	--*)
  		__gitcomp "--pretty= --format= --abbrev-commit --oneline
 +			--show-signature
  			$__git_diff_common_options
  			"
  		return