Re: [PATCH v2 1/4] builtin: add git-check-mailmap command
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 12, 2013, 05:47 UTC
- Message-ID
- <7vbo68pbwm.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CAPig+cQvnKSxZ5M6zW_r6Y9xwZ0Ch99JDq4SccYXCRof9svsOg@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 13 quoted lines
>> For each contact information (either in the form of ``Name >> <user@host>'' or ...) >> >> in order to clarify that the two forms of input is what you call >> "contact information". > > Is this easier to read? > > For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the > command-line or standard input (when using `--stdin`), print a line > showing either the canonical name and email address (see "Mapping > Authors" below), or the input ``Name $$<user@host>$$'' or > ``$$<user@host>$$'' if there is no mapping for that person.
I find it easier than your original, but I do not know if you would want to repeat the "Name... or <user@host>" at the end. It does not seem to add much useful information and is distracting.
Show 6 quoted lines
>> If there isn't, use "null_term_line" like they do. > > In check-attr, null_term_line indicates that _input_ lines are > null-terminated. In check-ignore, null_term_lines is overloaded (and > perhaps abused) to mean that both _input_ and _output_ lines are > null-terminated.
That is unfortunate but it is good that you found the breakage. As we do not have --nul-terminated-input and --nul-terminated-output options separtely, -z should apply to both input and output. What b4666852 (check-attr: Add --stdin option, 2008-10-07) did is broken. What check-ignore does
We should find a way to fix it. I have a feeling that silently fixing it and seeing if anybody screams might be the best course of action ;-).
Also "git check-ignore -h" advertises "-z" as only affecting "--stdin", which is also wrong. It does affect both input and output as it should, so it should be described as such, I think.
Thanks for noticing.