diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:23:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:23:43 -0700 |
| commit | 713ee7fe46dce859e46dbb255498ff79cdfb7fba (patch) | |
| tree | 35d6e0b06d42b772f7fb1920d79bed8afedae504 /t/t1308-config-set.sh | |
| parent | f9a2fd36169f04f65a71269b9eef47bfe98e8c8f (diff) | |
| parent | dc05179b5a8a6dcc9a25de461d43fb5edfc93c46 (diff) | |
| download | git-713ee7fe46dce859e46dbb255498ff79cdfb7fba.tar.gz | |
Merge branch 'ta/config-set'
* ta/config-set:
t1308: fix broken here document in test script
Diffstat (limited to 't/t1308-config-set.sh')
| -rwxr-xr-x | t/t1308-config-set.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 ' |