Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx> --- t/t1308-config-set.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index 4752fd9..ea031bf 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -150,8 +150,8 @@ test_expect_success 'find value from a configset' ' ' test_expect_success 'find value with highest priority from a configset' ' - echo hask > expect && - test-config configset_get_value case.baz config2 .git/config >actual && + echo hask >expect && + test-config configset_get_value case.baz config2 .git/config >actual && test_cmp expect actual ' @@ -163,7 +163,7 @@ test_expect_success 'find value_list for a key from a configset' ' lama ball EOF - test-config configset_get_value case.baz config2 .git/config >actual && + test-config configset_get_value case.baz config2 .git/config >actual && test_cmp expect actual ' @@ -173,7 +173,7 @@ test_expect_success 'proper error on non-existant files' ' test_cmp expect actual ' -test_expect_success 'proper error on non-accessible files' ' +test_expect_success 'proper error on non-accessible files' ' chmod -r .git/config && test_when_finished "chmod +r .git/config" && echo "Error reading configuration file .git/config." >expect && @@ -184,14 +184,14 @@ test_expect_success 'proper error on non-accessible files' ' 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 "[" >>.git/config && echo "fatal: bad config file line 35 in .git/config" >expect && test_expect_code 128 test-config get_value foo.bar 2>actual && test_cmp expect actual ' test_expect_success 'proper error on error in custom config files' ' - echo "[" >> syntax-error && + echo "[" >>syntax-error && echo "fatal: bad config file line 1 in syntax-error" >expect && test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual && test_cmp expect actual -- 2.0.0.262.gdafc651 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html