t5520: test --[no-]autostash with pull.rebase=true

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 91235b76ba76f7e7e9338e37da7106eb550969e6..005d66dbef6c361363752b37087bbbc6a3098833 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -195,14 +195,14 @@ 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 34 in .git/config" >expect &&
+       echo "fatal: bad config line 34 in file .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 "fatal: bad config file line 1 in syntax-error" >expect &&
+       echo "fatal: bad config line 1 in file syntax-error" >expect &&
        test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
        test_cmp expect actual
 '
@@ -218,4 +218,15 @@ test_expect_success 'check line errors for malformed values' '
        test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
 '
 
+test_expect_success 'error on modifying repo config without repo' '
+       mkdir no-repo &&
+       (
+               GIT_CEILING_DIRECTORIES=$(pwd) &&
+               export GIT_CEILING_DIRECTORIES &&
+               cd no-repo &&
+               test_must_fail git config a.b c 2>err &&
+               grep "not in a git directory" err
+       )
+'
+
 test_done