summaryrefslogtreecommitdiff
path: root/Documentation/git-check-attr.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-04 19:23:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-04 19:23:25 (GMT)
commit0db320d023ea41b201edd4bbf67a2e275726f705 (patch)
tree759a56e7f5f6ae42a9ad1599e75a7dcd373d9808 /Documentation/git-check-attr.txt
parent0a41de8f81d8fa39fa17943cd1ed5e0274fef187 (diff)
parentf7cd8c50b9ab83e084e8f52653ecc8d90665eef2 (diff)
downloadgit-0db320d023ea41b201edd4bbf67a2e275726f705.zip
git-0db320d023ea41b201edd4bbf67a2e275726f705.tar.gz
git-0db320d023ea41b201edd4bbf67a2e275726f705.tar.bz2
Merge branch 'jc/check-x-z'
"git check-ignore -z" applied the NUL termination to both its input (with --stdin) and its output, but "git check-attr -z" ignored the option on the output side. This is potentially a backward incompatible fix. Let's see if anybody screams before deciding if we want to do anything to help existing users (there may be none). * jc/check-x-z: check-attr -z: a single -z should apply to both input and output check-ignore -z: a single -z should apply to both input and output check-attr: the name of the character is NUL, not NULL check-ignore: the name of the character is NUL, not NULL
Diffstat (limited to 'Documentation/git-check-attr.txt')
-rw-r--r--Documentation/git-check-attr.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index a7be80d..00e2aa2 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -31,8 +31,9 @@ OPTIONS
Read file names from stdin instead of from the command-line.
-z::
- Only meaningful with `--stdin`; paths are separated with a
- NUL character instead of a linefeed character.
+ The output format is modified to be machine-parseable.
+ If `--stdin` is also given, input paths are separated
+ with a NUL character instead of a linefeed character.
\--::
Interpret all preceding arguments as attributes and all following
@@ -48,6 +49,10 @@ OUTPUT
The output is of the form:
<path> COLON SP <attribute> COLON SP <info> LF
+unless `-z` is in effect, in which case NUL is used as delimiter:
+<path> NUL <attribute> NUL <info> NUL
+
+
<path> is the path of a file being queried, <attribute> is an attribute
being queried and <info> can be either: