kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ta/config-set' 

* ta/config-set:
  t1308: fix broken here document in test script
maint
Junio C Hamano 2014-10-20 12:23:42 -07:00
parent f9a2fd3616 dc05179b5a
commit 713ee7fe46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t1308-config-set.sh
View File

@ -23,7 +23,7 @@ check_config () {
} }


test_expect_success 'setup default config' ' test_expect_success 'setup default config' '
cat >.git/config <<\EOF cat >.git/config <<-\EOF
[case] [case]
penguin = very blue penguin = very blue
Movie = BadPhysics Movie = BadPhysics
@ -195,7 +195,7 @@ test_expect_success 'proper error on error in default config files' '
cp .git/config .git/config.old && cp .git/config .git/config.old &&
test_when_finished "mv .git/config.old .git/config" && test_when_finished "mv .git/config.old .git/config" &&
echo "[" >>.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_expect_code 128 test-config get_value foo.bar 2>actual &&
test_cmp expect actual test_cmp expect actual
' '