Merge branch 'jk/quote-env-path-list-component'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:21 +0000 (10:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:21 +0000 (10:59 -0700)
A test fix.

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

1  2 
t/t5615-alternate-env.sh
diff --combined t/t5615-alternate-env.sh
index 26ebb0375deb67be38974c7c5610f090a5a2a9aa,63ef0b79952d9551e8c38496d19850eb02d7caab..d2d883f3a1d473a2b69fab05adbb21e67e5e600c
@@@ -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' '