From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v3 3/6] diff: allow --patch & cie to override -s/--no-patch
Date: Mon, 15 Jul 2013 20:23:56 +0200 [thread overview]
Message-ID: <vpqvc4badhf.fsf@anie.imag.fr> (raw)
In-Reply-To: <20130715180908.GE14690@google.com> (Jonathan Nieder's message of "Mon, 15 Jul 2013 11:09:09 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Matthieu Moy wrote:
>
>> All options that trigger a patch output now override --no-patch.
>>
>> The case of --binary is particular as the name may suggest that it turns
>
> Usage nit: this should say "is unusual"
I don't get it. The point is not that --binary is unusual, but that it
is a particular case that deserves extra attention.
> or "In the case of --binary in particular, the name may suggest ...".
Not really. I'd use "in particular" if --binary was a sub-case of the
others, but here I'm precisely saying that it may not be.
>> --- a/t/t4000-diff-format.sh
>> +++ b/t/t4000-diff-format.sh
>> @@ -71,4 +71,9 @@ test_expect_success 'git diff-files --no-patch as synonym for -s' '
>> test_must_be_empty err
>> '
>>
>> +test_expect_success 'git diff-files --no-patch --patch shows the patch' '
>> + git diff-files --no-patch --patch >diff-np-output 2>err &&
>> + compare_diff_patch expected actual
>
> Shouldn't that be "compare_diff_patch expected diff-np-output"?
Oops, right.
> A couple of other test ideas:
>
> - "git diff-files --patch --no-patch"
> - "git diff-files -s --patch-with-stat"
I'd rather avoid having a too long list here, or we'll end-up testing
all combinations of options ...
I'll send a reroll tomorrow.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2013-07-15 18:26 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 11:25 Bug in "git show"? Stefan Beller
2013-07-15 12:12 ` Matthieu Moy
2013-07-15 12:23 ` Stefan Beller
2013-07-15 13:07 ` [PATCH 0/5] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-15 13:07 ` [PATCH 1/5] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 13:07 ` [PATCH 2/5] diff: allow --patch to override -s/--no-patch Matthieu Moy
2013-07-15 15:02 ` Junio C Hamano
2013-07-15 15:28 ` Matthieu Moy
2013-07-15 16:40 ` Junio C Hamano
2013-07-15 17:05 ` [PATCH v2 0/5] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-15 17:05 ` [PATCH v2 1/5] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 17:35 ` Jonathan Nieder
2013-07-15 17:55 ` [PATCH v3 0/6] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-15 17:55 ` [PATCH v3 1/6] t4000-diff-format.sh: modernize style Matthieu Moy
2013-07-15 18:00 ` Jonathan Nieder
2013-07-15 17:55 ` [PATCH v3 2/6] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 17:55 ` [PATCH v3 3/6] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-15 18:09 ` Jonathan Nieder
2013-07-15 18:23 ` Matthieu Moy [this message]
2013-07-15 18:58 ` Jonathan Nieder
2013-07-16 8:05 ` [PATCH v4 0/6] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 1/6] t4000-diff-format.sh: modernize style Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 2/6] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 3/6] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 4/6] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 5/6] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-16 8:05 ` [PATCH v4 6/6] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-16 17:46 ` [PATCH v4 0/6] Make "git show -s" easier to discover for users Jonathan Nieder
2013-07-16 18:07 ` Stefan Beller
2013-07-18 0:51 ` Junio C Hamano
2013-07-15 17:55 ` [PATCH v3 4/6] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 17:55 ` [PATCH v3 5/6] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 17:55 ` [PATCH v3 6/6] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-15 18:17 ` Jonathan Nieder
2013-07-15 17:05 ` [PATCH v2 2/5] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-15 17:05 ` [PATCH v2 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 17:05 ` [PATCH v2 4/5] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 17:05 ` [PATCH v2 5/5] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-15 13:07 ` [PATCH 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 14:54 ` Junio C Hamano
2013-07-15 15:06 ` Junio C Hamano
2013-07-15 13:07 ` [PATCH 4/5] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 13:07 ` [PATCH 5/5] Documentation/git-log.txt: capitalize section names Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqvc4badhf.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.