From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2010 19:11:12 +0000 (-0700)
Subject: Merge branch 'uk/fix-author-ident-sed-script'
X-Git-Tag: v1.7.4-rc0~188
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/90d6bd5ed3bd5de7be037abace4afa065fb2207b?ds=inline;hp=-c

Merge branch 'uk/fix-author-ident-sed-script'

* uk/fix-author-ident-sed-script:
get_author_ident_from_commit(): remove useless quoting
---

90d6bd5ed3bd5de7be037abace4afa065fb2207b
diff --combined git-sh-setup.sh
index 58d30c9388,8d54b73d32..ae031a1375
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@@ -151,17 -151,14 +151,14 @@@ get_author_ident_from_commit () 
  		s/'\''/'\''\\'\'\''/g
  		h
  		s/^author \([^<]*\) <[^>]*> .*$/\1/
- 		s/'\''/'\''\'\'\''/g
  		s/.*/GIT_AUTHOR_NAME='\''&'\''/p
  
  		g
  		s/^author [^<]* <\([^>]*\)> .*$/\1/
- 		s/'\''/'\''\'\'\''/g
  		s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
  
  		g
  		s/^author [^<]* <[^>]*> \(.*\)$/\1/
- 		s/'\''/'\''\'\'\''/g
  		s/.*/GIT_AUTHOR_DATE='\''&'\''/p
  
  		q
@@@ -209,20 -206,5 +206,20 @@@ case $(uname -s) i
  	find () {
  		/usr/bin/find "$@"
  	}
 +	is_absolute_path () {
 +		case "$1" in
 +		[/\\]* | [A-Za-z]:*)
 +			return 0 ;;
 +		esac
 +		return 1
 +	}
  	;;
 +*)
 +	is_absolute_path () {
 +		case "$1" in
 +		/*)
 +			return 0 ;;
 +		esac
 +		return 1
 +	}
  esac