From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:28 +0000 (-0700)
Subject: Merge branch 'jk/quote-env-path-list-component' into maint
X-Git-Tag: v2.12.3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/27ee56f9db26fb863f5f449cb3e7dade932f953a?ds=inline;hp=-c

Merge branch 'jk/quote-env-path-list-component' into maint

A test fix.

* jk/quote-env-path-list-component:
t5615: fix a here-doc syntax error
---

27ee56f9db26fb863f5f449cb3e7dade932f953a
diff --combined t/t5615-alternate-env.sh
index 26ebb0375d,63ef0b7995..d2d883f3a1
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@@ -31,14 -31,14 +31,14 @@@ test_expect_success 'objects inaccessib
  '
  
  test_expect_success 'access alternate via absolute path' '
 -	check_obj "$(pwd)/one.git/objects" <<-EOF
 +	check_obj "$PWD/one.git/objects" <<-EOF
  	$one blob
  	$two missing
  	EOF
  '
  
  test_expect_success 'access multiple alternates' '
 -	check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
 +	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
  	$one blob
  	$two blob
  	EOF
@@@ -77,6 -77,7 +77,7 @@@ test_expect_success 'mix of quoted and 
  	check_obj "$quoted:$unquoted" <<-EOF
  	$one blob
  	$two blob
+ 	EOF
  '
  
  test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '