From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2012 02:40:55 +0000 (-0800)
Subject: Sync with 1.8.0.1
X-Git-Tag: v1.8.1-rc0~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f9b329a7d1454fba71e6a72e92aff981afdacdd4?hp=-c

Sync with 1.8.0.1
---

f9b329a7d1454fba71e6a72e92aff981afdacdd4
diff --combined contrib/completion/git-completion.bash
index bc0657a224,48c3abdf98..85ae4191e5
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -321,7 -321,7 +321,7 @@@ __git_refs (
  				if [[ "$ref" == "$cur"* ]]; then
  					echo "$ref"
  				fi
- 			done | uniq -u
+ 			done | sort | uniq -u
  		fi
  		return
  	fi
@@@ -1116,14 -1116,6 +1116,14 @@@ _git_fetch (
  	__git_complete_remote_or_refspec
  }
  
 +__git_format_patch_options="
 +	--stdout --attach --no-attach --thread --thread= --output-directory
 +	--numbered --start-number --numbered-files --keep-subject --signoff
 +	--signature --no-signature --in-reply-to= --cc= --full-index --binary
 +	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
 +	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
 +"
 +
  _git_format_patch ()
  {
  	case "$cur" in
@@@ -1134,7 -1126,21 +1134,7 @@@
  		return
  		;;
  	--*)
 -		__gitcomp "
 -			--stdout --attach --no-attach --thread --thread=
 -			--output-directory
 -			--numbered --start-number
 -			--numbered-files
 -			--keep-subject
 -			--signoff --signature --no-signature
 -			--in-reply-to= --cc=
 -			--full-index --binary
 -			--not --all
 -			--cover-letter
 -			--no-prefix --src-prefix= --dst-prefix=
 -			--inline --suffix= --ignore-if-in-upstream
 -			--subject-prefix=
 -			"
 +		__gitcomp "$__git_format_patch_options"
  		return
  		;;
  	esac
@@@ -1548,12 -1554,6 +1548,12 @@@ _git_send_email (
  		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
  		return
  		;;
 +	--thread=*)
 +		__gitcomp "
 +			deep shallow
 +			" "" "${cur##--thread=}"
 +		return
 +		;;
  	--*)
  		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
  			--compose --confirm= --dry-run --envelope-sender
@@@ -1563,12 -1563,11 +1563,12 @@@
  			--signed-off-by-cc --smtp-pass --smtp-server
  			--smtp-server-port --smtp-encryption= --smtp-user
  			--subject --suppress-cc= --suppress-from --thread --to
 -			--validate --no-validate"
 +			--validate --no-validate
 +			$__git_format_patch_options"
  		return
  		;;
  	esac
 -	COMPREPLY=()
 +	__git_complete_revlist
  }
  
  _git_stage ()