From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Oct 2014 19:23:42 +0000 (-0700)
Subject: Merge branch 'ta/config-set'
X-Git-Tag: v2.2.0-rc0~39
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/713ee7fe46dce859e46dbb255498ff79cdfb7fba?hp=f9a2fd36169f04f65a71269b9eef47bfe98e8c8f

Merge branch 'ta/config-set'

* ta/config-set:
t1308: fix broken here document in test script
---

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ea0bce2dc6..91235b76ba 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -23,7 +23,7 @@ check_config () {
 }
 
 test_expect_success 'setup default config' '
-	cat >.git/config <<\EOF
+	cat >.git/config <<-\EOF
 	[case]
 		penguin = very blue
 		Movie = BadPhysics
@@ -195,7 +195,7 @@ test_expect_success 'proper error on error in default config files' '
 	cp .git/config .git/config.old &&
 	test_when_finished "mv .git/config.old .git/config" &&
 	echo "[" >>.git/config &&
-	echo "fatal: bad config file line 35 in .git/config" >expect &&
+	echo "fatal: bad config file line 34 in .git/config" >expect &&
 	test_expect_code 128 test-config get_value foo.bar 2>actual &&
 	test_cmp expect actual
 '