Merge branch 'ta/config-set'

* ta/config-set: t1308: fix broken here document in test script
git-mirror · Oct 20, 2014 · 713ee7f · 713ee7f
2 parents f9a2fd3 + dc05179
commit 713ee7f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 '