From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jan 2013 18:59:07 +0000 (-0800)
Subject: Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash'
X-Git-Tag: v1.8.2-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/38f7636410a41769af36a5abfdf0f02f3542c6b1?ds=inline;hp=-c

Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash'

Fix use of an array notation that older versions of bash do not
understand.

* bc/fix-array-syntax-for-3.0-in-completion-bash:
git-completion.bash: replace zsh notation that breaks bash 3.X
---

38f7636410a41769af36a5abfdf0f02f3542c6b1
diff --combined contrib/completion/git-completion.bash
index 7147d64af2,2f99420055..8c49ce2544
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -397,7 -397,7 +397,7 @@@ __git_complete_revlist_file (
  		*)   pfx="$ref:$pfx" ;;
  		esac
  
 -		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
 +		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \
  				| sed '/^100... blob /{
  				           s,^.*	,,
  				           s,$, ,
@@@ -563,7 -563,6 +563,7 @@@ __git_list_porcelain_commands (
  		archimport)       : import;;
  		cat-file)         : plumbing;;
  		check-attr)       : plumbing;;
 +		check-ignore)     : plumbing;;
  		check-ref-format) : plumbing;;
  		checkout-index)   : plumbing;;
  		commit-tree)      : plumbing;;
@@@ -2432,7 -2431,7 +2432,7 @@@ if [[ -n ${ZSH_VERSION-} ]]; the
  				--*=*|*.) ;;
  				*) c="$c " ;;
  				esac
- 				array+=("$c")
+ 				array[$#array+1]="$c"
  			done
  			compset -P '*[=:]'
  			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0