Junio C Hamano <gitster@xxxxxxxxx> writes:
> The change from "cmdline" to "command line" does need to happen
> before the end of the series, but I do not think it should happen
> here, especialy given that the proposed log message explains that
> this step is to expose scope_name() under a better name (which is a
> very good split point).
I'll tweak this step with the attached patch, and then adjust
06/10 as needed, while queuing.
config.c | 2 +-
config.h | 1 -
t/t1308-config-set.sh | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c
index 83bb98d65e..a922b136e5 100644
--- a/config.c
+++ b/config.c
@@ -3307,7 +3307,7 @@ const char *config_scope_name(enum config_scope scope)
case CONFIG_SCOPE_REPO:
return "repo";
case CONFIG_SCOPE_CMDLINE:
- return "command line";
+ return "cmdline";
default:
return "unknown";
}
diff --git a/config.h b/config.h
index dcb8c274d4..c063f33ff6 100644
--- a/config.h
+++ b/config.h
@@ -35,7 +35,6 @@ struct object_id;
#define CONFIG_REGEX_NONE ((void *)1)
-
struct git_config_source {
unsigned int use_stdin:1;
const char *file;
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 5f3e71a160..7b4e1a63eb 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -265,7 +265,7 @@ test_expect_success 'iteration shows correct origins' '
value=from-cmdline
origin=command line
name=
- scope=command line
+ scope=cmdline
EOF
GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
test_cmp expect actual
