From: Lars Schneider <[email protected]>
---
Documentation/git-config.txt | 5 +++--
builtin/config.c | 2 +-
t/t1300-repo-config.sh | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 6374997..499fc0f 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -196,8 +196,9 @@ See also <<FILES>>.
--show-origin::
Augment the output of all queried config options with the
- origin type (file, stdin, blob, cmdline) and the actual origin
- (config file path, ref, or blob id if applicable).
+ origin type (file, standard input, blob, command line) and
+ the actual origin (config file path, ref, or blob id if
+ applicable).
--get-colorbool name [stdout-is-tty]::
diff --git a/builtin/config.c b/builtin/config.c
index a1a9b9a..0f14220 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -83,7 +83,7 @@ static struct option builtin_config_options[] = {
OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
OPT_BOOL(0, "includes", &respect_includes, N_("respect include
directives on lookup")),
- OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config
(file, stdin, blob, cmdline)")),
+ OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config
(file, standard input, blob, command line)")),
OPT_END(),
};
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 254643a..8867ce1 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1246,7 +1246,7 @@ test_expect_success '--show-origin with --list' '
file:.git/config user.override=local
file:.git/config include.path=../include/relative.include
file:.git/../include/relative.include user.relative=include
- cmdline: user.cmdline=true
+ command line: user.cmdline=true
EOF
git -c user.cmdline=true config --list --show-origin >output &&
test_cmp expect output
@@ -1262,7 +1262,7 @@ test_expect_success '--show-origin with --list --null' '
trueQfile:.git/configQuser.override
localQfile:.git/configQinclude.path
../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
- includeQcmdline:Quser.cmdline
+ includeQcommand line:Quser.cmdline
trueQ
EOF
git -c user.cmdline=true config --null --list --show-origin >output.raw
&&
@@ -1318,7 +1318,7 @@ test_expect_success '--show-origin escape special file
name characters' '
test_expect_success '--show-origin stdin' '
cat >expect <<-\EOF &&
- stdin: user.custom=true
+ standard input: user.custom=true
EOF
git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output
&&
test_cmp expect output
--
2.5.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
