[PATCH v7 1/2] fixup: config: add 'origin_type' to config_source struct
flat view
DORMANTno replies
From: <hidden>
Date: 2016-06-15 23:08:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v6 of 5 in this series.
Revisions (5)
- v3 [diff vs current]
- v4 [diff vs current]
- v5 [diff vs current]
- v6
- v6 current
From: Lars Schneider <redacted> --- config.c | 4 ++-- t/t1300-repo-config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c
index 3be2cbc..0fce371 100644
--- a/config.c
+++ b/config.c@@ -1081,7 +1081,7 @@ static int do_config_from_file(config_fn_t fn, static int git_config_from_stdin(config_fn_t fn, void *data) { - return do_config_from_file(fn, "stdin", "", NULL, stdin, data); + return do_config_from_file(fn, "standard input", "", NULL, stdin, data); } int git_config_from_file(config_fn_t fn, const char *filename, void *data)
@@ -2392,7 +2392,7 @@ int parse_config_key(const char *var, const char *current_config_origin_type(void) { - return cf && cf->origin_type ? cf->origin_type : "cmdline"; + return cf && cf->origin_type ? cf->origin_type : "command line"; } const char *current_config_name(void)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index e54f6d5..254643a 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh@@ -707,7 +707,7 @@ test_expect_success 'invalid unit' ' ' test_expect_success 'invalid stdin config' ' - echo "fatal: bad config line 1 in stdin " >expect && + echo "fatal: bad config line 1 in standard input " >expect && echo "[broken" | test_must_fail git config --list --file - >output 2>&1 && test_cmp expect output '
--
2.5.1