From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 May 2009 02:49:42 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~165
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/671d1bc6a098d1015fbdd6e085d6daf12c1dce15?ds=inline;hp=-c

Merge branch 'maint'

* maint:
test: checkout shouldn't say that HEAD has moved if it didn't
completion: enhance "current branch" display
completion: simplify "current branch" in __git_ps1()
completion: fix PS1 display during a merge on detached HEAD
builtin-checkout: Don't tell user that HEAD has moved before it has
pre-commit.sample: don't print incidental SHA1
tests: Add tests for missing format-patch long options
api-parse-options.txt: use 'func' instead of 'funct'
Turn on USE_ST_TIMESPEC for OpenBSD
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
---

671d1bc6a098d1015fbdd6e085d6daf12c1dce15
diff --combined contrib/completion/git-completion.bash
index ad26b7c5ae,dd6cd250e3..b6bcd5cc26
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -99,20 -99,32 +99,32 @@@ __git_ps1 (
  		elif [ -d "$g/rebase-merge" ]; then
  			r="|REBASE-m"
  			b="$(cat "$g/rebase-merge/head-name")"
- 		elif [ -f "$g/MERGE_HEAD" ]; then
- 			r="|MERGING"
- 			b="$(git symbolic-ref HEAD 2>/dev/null)"
  		else
+ 			if [ -f "$g/MERGE_HEAD" ]; then
+ 				r="|MERGING"
+ 			fi
  			if [ -f "$g/BISECT_LOG" ]; then
  				r="|BISECTING"
  			fi
- 			if ! b="$(git symbolic-ref HEAD 2>/dev/null)"; then
- 				if ! b="$(git describe --exact-match HEAD 2>/dev/null)"; then
- 					if [ -r "$g/HEAD" ]; then
- 						b="$(cut -c1-7 "$g/HEAD")..."
- 					fi
- 				fi
- 			fi
+ 
+ 			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
+ 
+ 				b="$(
+ 				case "${GIT_PS1_DESCRIBE_STYLE-}" in
+ 				(contains)
+ 					git describe --contains HEAD ;;
+ 				(branch)
+ 					git describe --contains --all HEAD ;;
+ 				(describe)
+ 					git describe HEAD ;;
+ 				(* | default)
+ 					git describe --exact-match HEAD ;;
+ 				esac 2>/dev/null)" ||
+ 
+ 				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
+ 				b="unknown"
+ 				b="($b)"
+ 			}
  		fi
  
  		local w
@@@ -1322,35 -1334,6 +1334,35 @@@ _git_send_email (
  	COMPREPLY=()
  }
  
 +__git_config_get_set_variables ()
 +{
 +	local prevword word config_file= c=$COMP_CWORD
 +	while [ $c -gt 1 ]; do
 +		word="${COMP_WORDS[c]}"
 +		case "$word" in
 +		--global|--system|--file=*)
 +			config_file="$word"
 +			break
 +			;;
 +		-f|--file)
 +			config_file="$word $prevword"
 +			break
 +			;;
 +		esac
 +		prevword=$word
 +		c=$((--c))
 +	done
 +
 +	for i in $(git --git-dir="$(__gitdir)" config $config_file --list \
 +			2>/dev/null); do
 +		case "$i" in
 +		*.*)
 +			echo "${i/=*/}"
 +			;;
 +		esac
 +	done
 +}
 +
  _git_config ()
  {
  	local cur="${COMP_WORDS[COMP_CWORD]}"
@@@ -1417,10 -1400,6 +1429,10 @@@
  		__gitcomp "$__git_send_email_suppresscc_options"
  		return
  		;;
 +	--get|--get-all|--unset|--unset-all)
 +		__gitcomp "$(__git_config_get_set_variables)"
 +		return
 +		;;
  	*.*)
  		COMPREPLY=()
  		return