From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Mar 2011 21:10:41 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=17a02998078923f2d62811326d130de991d1a95a;p=git.git

Merge branch 'maint'

* maint:
  contrib/thunderbird-patch-inline: do not require bash to run the script
  t8001: check the exit status of the command being tested
  strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
  Typos: t/README
  Documentation/config.txt: make truth value of numbers more explicit
  git-pack-objects.txt: fix grammatical errors
  parse-remote: replace unnecessary sed invocation
---

17a02998078923f2d62811326d130de991d1a95a
diff --cc git-parse-remote.sh
index e7013f7ba,d3782d955..91688792a
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@@ -4,8 -4,59 +4,9 @@@
  # this would fail in that case and would issue an error message.
  GIT_DIR=$(git rev-parse -q --git-dir) || :;
  
 -get_data_source () {
 -	case "$1" in
 -	*/*)
 -		echo ''
 -		;;
 -	.)
 -		echo self
 -		;;
 -	*)
 -		if test "$(git config --get "remote.$1.url")"
 -		then
 -			echo config
 -		elif test -f "$GIT_DIR/remotes/$1"
 -		then
 -			echo remotes
 -		elif test -f "$GIT_DIR/branches/$1"
 -		then
 -			echo branches
 -		else
 -			echo ''
 -		fi ;;
 -	esac
 -}
 -
 -get_remote_url () {
 -	data_source=$(get_data_source "$1")
 -	case "$data_source" in
 -	'')
 -		echo "$1"
 -		;;
 -	self)
 -		echo "$1"
 -		;;
 -	config)
 -		git config --get "remote.$1.url"
 -		;;
 -	remotes)
 -		sed -ne '/^URL: */{
 -			s///p
 -			q
 -		}' "$GIT_DIR/remotes/$1"
 -		;;
 -	branches)
 -		sed -e 's/#.*//' "$GIT_DIR/branches/$1"
 -		;;
 -	*)
 -		die "internal error: get-remote-url $1" ;;
 -	esac
 -}
 -
  get_default_remote () {
- 	curr_branch=$(git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||')
+ 	curr_branch=$(git symbolic-ref -q HEAD)
+ 	curr_branch="${cur_branch#refs/heads/}"
  	origin=$(git config --get "branch.$curr_branch.remote")
  	echo ${origin:-origin}
  }