From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:37 +0000 (-0700)
Subject: Merge branch 'as/maint-completion-set-u-fix'
X-Git-Tag: v1.7.2-rc1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/304d8b6256db7aca7772c0a994a7c1c987eabd97?ds=inline;hp=-c

Merge branch 'as/maint-completion-set-u-fix'

* as/maint-completion-set-u-fix:
bash-completion: Fix __git_ps1 to work with "set -u"
---

304d8b6256db7aca7772c0a994a7c1c987eabd97
diff --combined contrib/completion/git-completion.bash
index 14874377af,256b1a8f92..bc9df12bf1
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -84,8 -84,8 +84,8 @@@ __git_ps1 (
  {
  	local g="$(__gitdir)"
  	if [ -n "$g" ]; then
- 		local r
- 		local b
+ 		local r=""
+ 		local b=""
  		if [ -f "$g/rebase-merge/interactive" ]; then
  			r="|REBASE-i"
  			b="$(cat "$g/rebase-merge/head-name")"
@@@ -127,11 -127,11 +127,11 @@@
  			}
  		fi
  
- 		local w
- 		local i
- 		local s
- 		local u
- 		local c
+ 		local w=""
+ 		local i=""
+ 		local s=""
+ 		local u=""
+ 		local c=""
  
  		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
  			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
@@@ -842,7 -842,7 +842,7 @@@ _git_checkout (
  	--*)
  		__gitcomp "
  			--quiet --ours --theirs --track --no-track --merge
 -			--conflict= --patch
 +			--conflict= --orphan --patch
  			"
  		;;
  	*)
@@@ -1052,7 -1052,7 +1052,7 @@@ _git_format_patch (
  			--numbered --start-number
  			--numbered-files
  			--keep-subject
 -			--signoff
 +			--signoff --signature --no-signature
  			--in-reply-to= --cc=
  			--full-index --binary
  			--not --all
@@@ -1726,7 -1726,6 +1726,7 @@@ _git_config (
  		format.headers
  		format.numbered
  		format.pretty
 +		format.signature
  		format.signoff
  		format.subjectprefix
  		format.suffix