global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-07 07:20:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/check-x-z'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2013-09-04 12:23:24 -07:00
parent 0a41de8f81 f7cd8c50b9
commit 0db320d023
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-check-attr.txt
View File

@@ -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: