config: add a notion of "scope"

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index d345a885a35544241550d79c15be7ef098613204..065d5ebb09fa0d3dbc5d2abc3be0cb815cca17f6 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -238,16 +238,19 @@ test_expect_success 'iteration shows correct origins' '
        value=from-home
        origin=file
        name=$(pwd)/.gitconfig
+       scope=global
 
        key=foo.bar
        value=from-repo
        origin=file
        name=.git/config
+       scope=repo
 
        key=foo.bar
        value=from-cmdline
        origin=command line
        name=
+       scope=cmdline
        EOF
        GIT_CONFIG_PARAMETERS=$cmdline_config test-config iterate >actual &&
        test_cmp expect actual