From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Mar 2012 06:21:52 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.10-rc0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91527e54d565e6fb6910fb3cb22f5915b5bd346e;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes to 1.7.9.3 for the last time
  http.proxy: also mention https_proxy and all_proxy
  t0300: work around bug in dash 0.5.6
  t5512 (ls-remote): modernize style
  tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
---

91527e54d565e6fb6910fb3cb22f5915b5bd346e
diff --cc t/t0300-credentials.sh
index 8621ab036,c1c810814..20e28e34e
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@@ -12,9 -14,11 +14,10 @@@ test_expect_success 'setup helper scrip
  		echo >&2 "$whoami: $key=$value"
  		eval "$key=$value"
  	done
+ 	IFS=$OIFS
  	EOF
  
 -	cat >git-credential-useless <<-\EOF &&
 -	#!/bin/sh
 +	write_script git-credential-useless <<-\EOF &&
  	. ./dump
  	exit 0
  	EOF