upload-pack: move allow_unadvertised_object_request to upload_pack_data

[thirdparty/git.git] / t / t1308-config-set.sh

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 3e00d1af01fb771bd3fd26dcb265a3d80da37934..3a527e3a8438a583bfd8704ad23f9ae2e48ac382 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -166,14 +166,14 @@ test_expect_success 'find value with highest priority from a configset' '
 '
 
 test_expect_success 'find value_list for a key from a configset' '
-       cat >except <<-\EOF &&
+       cat >expect <<-\EOF &&
+       lama
+       ball
        sam
        bat
        hask
-       lama
-       ball
        EOF
-       test-tool config configset_get_value case.baz config2 .git/config >actual &&
+       test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
        test_cmp expect actual
 '
 
@@ -233,13 +233,13 @@ test_expect_success 'check line errors for malformed values' '
 
 test_expect_success 'error on modifying repo config without repo' '
        nongit test_must_fail git config a.b c 2>err &&
-       grep "not in a git directory" err
+       test_i18ngrep "not in a git directory" err
 '
 
 cmdline_config="'foo.bar=from-cmdline'"
 test_expect_success 'iteration shows correct origins' '
-       echo "[foo]bar = from-repo" >.git/config &&
-       echo "[foo]bar = from-home" >.gitconfig &&
+       printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config &&
+       printf "[foo]\n\tbar = from-home\n" >.gitconfig &&
        if test_have_prereq MINGW
        then
                # Use Windows path (i.e. *not* $HOME)
@@ -253,19 +253,29 @@ test_expect_success 'iteration shows correct origins' '
        value=from-home
        origin=file
        name=$HOME_GITCONFIG
+       lno=2
        scope=global
 
+       key=ignore.this
+       value=please
+       origin=file
+       name=.git/config
+       lno=2
+       scope=local
+
        key=foo.bar
        value=from-repo
        origin=file
        name=.git/config
-       scope=repo
+       lno=3
+       scope=local
 
        key=foo.bar
        value=from-cmdline
        origin=command line
        name=
-       scope=cmdline
+       lno=-1
+       scope=command
        EOF
        GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
        test_cmp expect actual