[PATCH v4 0/6] config: allow user to know scope of config options
- From
- Matthew Rogers via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jan 24, 2020, 00:21 UTC
- Message-ID
- <pull.478.v4.git.1579825267.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.478.v3.git.1579275102.gitgitgadget@gmail.com>
This was originally a pull request to the git-for-windows repository [https://github.com/git-for-windows/git/pull/2399]. It adds a new option --show-scope which would allow a user to see what scope a given configuration value has (sytem, local, global, etc.).
changes since v3:
* Cleaned up t1300 * Expanded test coverage for t1300 to not rely as much on !MINGW by using a simpler filename for most tests * config_scope_name is now exposed in config.h * cleaned up commit messages for clarity/content (again)
Matthew Rogers (6): config: fix typo in variable name t1300: fix over-indented HERE-DOCs t1300: create custom config file without special characters config: split repo scope to local and worktree config: clarify meaning of command line scoping config: add '--show-scope' to print the scope of a config value
Documentation/git-config.txt | 15 ++- builtin/config.c | 46 +++++-- config.c | 35 ++++- config.h | 20 +-- remote.c | 3 +- submodule-config.c | 4 +- t/helper/test-config.c | 17 +-- t/t1300-config.sh | 240 ++++++++++++++++++++++------------- t/t1308-config-set.sh | 4 +- upload-pack.c | 3 +- 10 files changed, 248 insertions(+), 139 deletions(-)
base-commit: 232378479ee6c66206d47a9be175e3a39682aea6 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-478%2FROGERSM94%2Fadd-config-flags-v4 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-478/ROGERSM94/add-config-flags-v4 Pull-Request: https://github.com/gitgitgadget/git/pull/478
Range-diff vs v3:
1: f5a81a4d25 = 1: f5a81a4d25 config: fix typo in variable name
-: ---------- > 2: 1b42f85399 t1300: fix over-indented HERE-DOCs
-: ---------- > 3: 9d19794dfd t1300: create custom config file without special characters
2: f06f9291b7 ! 4: 9f160e281a config: refine config scope enum
@@ -1,6 +1,6 @@
Author: Matthew Rogers <mattr94@gmail.com>
- config: refine config scope enum
+ config: split repo scope to local and worktree
Previously when iterating through git config variables, worktree config
and local config were both considered "CONFIG_SCOPE_REPO". This was
@@ -93,14 +93,14 @@
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@
+ value=from-repo
+ origin=file
+ name=.git/config
+- scope=repo
++ scope=local
+
+ key=foo.bar
value=from-cmdline
- origin=command line
- name=
-- scope=cmdline
-+ scope=command
- EOF
- GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
- test_cmp expect actual
diff --git a/upload-pack.c b/upload-pack.c
--- a/upload-pack.c
3: 97b8a7641d ! 5: 7f00f8559d config: clarify meaning of command line scoping
@@ -53,3 +53,16 @@
default:
return "unknown";
}
+
+ diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
+ --- a/t/t1308-config-set.sh
+ +++ b/t/t1308-config-set.sh
+@@
+ value=from-cmdline
+ origin=command line
+ name=
+- scope=cmdline
++ scope=command
+ EOF
+ GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
+ test_cmp expect actual
4: 61ff3c64b5 ! 6: 5549db7e39 config: add '--show-scope' to print the scope of a config value
@@ -76,26 +76,6 @@
strbuf_addch(buf, term);
}
-+static const char *scope_to_string(enum config_scope scope)
-+{
-+ switch (scope) {
-+ case CONFIG_SCOPE_LOCAL:
-+ return "local";
-+ case CONFIG_SCOPE_GLOBAL:
-+ return "global";
-+ case CONFIG_SCOPE_SYSTEM:
-+ return "system";
-+ case CONFIG_SCOPE_WORKTREE:
-+ return "worktree";
-+ case CONFIG_SCOPE_COMMAND:
-+ return "command";
-+ case CONFIG_SCOPE_SUBMODULE:
-+ return "submodule";
-+ default:
-+ return "unknown";
-+ }
-+}
-+
+static void show_config_scope(struct strbuf *buf)
+{
+ const char term = end_nul ? '\0' : '\t';
@@ -211,6 +191,33 @@
/*
* If we have a specific filename, use it. Otherwise, follow the
* regular lookup sequence.
+@@
+ }
+ }
+
++const char *scope_to_string(enum config_scope scope)
++{
++ switch (scope) {
++ case CONFIG_SCOPE_SYSTEM:
++ return "system";
++ case CONFIG_SCOPE_GLOBAL:
++ return "global";
++ case CONFIG_SCOPE_LOCAL:
++ return "local";
++ case CONFIG_SCOPE_WORKTREE:
++ return "worktree";
++ case CONFIG_SCOPE_COMMAND:
++ return "command";
++ case CONFIG_SCOPE_SUBMODULE:
++ return "submodule";
++ default:
++ return "unknown";
++ }
++}
++
+ const char *current_config_name(void)
+ {
+ const char *name;
diff --git a/config.h b/config.h
--- a/config.h
@@ -228,6 +235,7 @@
+ CONFIG_SCOPE_COMMAND,
+ CONFIG_SCOPE_SUBMODULE,
+};
++const char *scope_to_string(enum config_scope scope);
+
struct git_config_source {
unsigned int use_stdin:1;
@@ -273,14 +281,38 @@
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@
- return "repo";
- case CONFIG_SCOPE_WORKTREE:
- return "worktree";
-+ case CONFIG_SCOPE_SUBMODULE:
-+ return "submodule";
- case CONFIG_SCOPE_COMMAND:
- return "command";
- default:
+ *
+ */
+
+-static const char *scope_name(enum config_scope scope)
+-{
+- switch (scope) {
+- case CONFIG_SCOPE_SYSTEM:
+- return "system";
+- case CONFIG_SCOPE_GLOBAL:
+- return "global";
+- case CONFIG_SCOPE_LOCAL:
+- return "repo";
+- case CONFIG_SCOPE_WORKTREE:
+- return "worktree";
+- case CONFIG_SCOPE_COMMAND:
+- return "command";
+- default:
+- return "unknown";
+- }
+-}
+ static int iterate_cb(const char *var, const char *value, void *data)
+ {
+ static int nr;
+@@
+ printf("value=%s\n", value ? value : "(null)");
+ printf("origin=%s\n", current_config_origin_type());
+ printf("name=%s\n", current_config_name());
+- printf("scope=%s\n", scope_name(current_config_scope()));
++ printf("scope=%s\n", scope_to_string(current_config_scope()));
+
+ return 0;
+ }
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
--- a/t/t1300-config.sh
@@ -313,6 +345,7 @@
+ git config --blob=$blob --show-scope --list >output &&
+ test_cmp expect output
+'
++
+test_expect_success '--show-scope with --local' '
+ cat >expect <<-\EOF &&
+ local user.local=true-- gitgitgadget