From: Richard Hansen <hansenr@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] diff: document the pattern format for diff.orderFile
Date: Tue, 10 Jan 2017 20:14:35 -0500 [thread overview]
Message-ID: <17d48ccd-fd19-3922-8ee8-af6558d22632@google.com> (raw)
In-Reply-To: <xmqq8tqismdx.fsf@gitster.mtv.corp.google.com>
On 2017-01-10 15:14, Junio C Hamano wrote:
> Richard Hansen <hansenr@google.com> writes:
>
>> Document the format of the patterns used for the diff.orderFile
>> setting and diff's '-O' option by referring the reader to the
>> gitignore[5] page.
>>
>> Signed-off-by: Richard Hansen <hansenr@google.com>
>> ---
>> Documentation/diff-config.txt | 3 ++-
>> Documentation/diff-options.txt | 3 ++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
>> index 875212045..a35ecdd6b 100644
>> --- a/Documentation/diff-config.txt
>> +++ b/Documentation/diff-config.txt
>> @@ -100,7 +100,8 @@ diff.noprefix::
>>
>> diff.orderFile::
>> File indicating how to order files within a diff, using
>> - one shell glob pattern per line.
>> + one glob pattern per line.
>> + See linkgit:gitignore[5] for the pattern format.
>
>
> I do not think it is wise to suggest referring to gitignore, as the
> logic of matching is quite different, other than the fact that they
> both use wildmatch() internally. Also, unlike gitignore, orderfile
> does not allow any negative matching i.e. "!<pattern>".
I was looking at the code to see how the two file formats differed and
noticed that match_order() doesn't set the WM_PATHNAME flag when it
calls wildmatch(). That's unintentional (a bug), right?
-Richard
>
>> If `diff.orderFile` is a relative pathname, it is treated as
>> relative to the top of the work tree.
>> Can be overridden by the '-O' option to linkgit:git-diff[1].
>> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
>> index e6215c372..dc6b1af71 100644
>> --- a/Documentation/diff-options.txt
>> +++ b/Documentation/diff-options.txt
>> @@ -467,7 +467,8 @@ endif::git-format-patch[]
>>
>> -O<orderfile>::
>> Output the patch in the order specified in the
>> - <orderfile>, which has one shell glob pattern per line.
>> + <orderfile>, which has one glob pattern per line.
>> + See linkgit:gitignore[5] for the pattern format.
>> This overrides the `diff.orderFile` configuration variable
>> (see linkgit:git-config[1]). To cancel `diff.orderFile`,
>> use `-O/dev/null`.
next prev parent reply other threads:[~2017-01-11 1:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 0:40 [PATCH 0/2] minor diff orderfile documentation improvements Richard Hansen
2017-01-10 0:40 ` [PATCH 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-10 6:58 ` Jeff King
2017-01-10 17:27 ` Richard Hansen
2017-01-10 20:19 ` Junio C Hamano
2017-01-10 20:23 ` Junio C Hamano
2017-01-10 22:01 ` Richard Hansen
2017-01-10 22:15 ` Junio C Hamano
2017-01-11 14:41 ` Jeff King
2017-01-11 20:53 ` Junio C Hamano
2017-01-10 0:40 ` [PATCH 2/2] diff: document the pattern format for diff.orderFile Richard Hansen
2017-01-10 20:14 ` Junio C Hamano
2017-01-11 1:14 ` Richard Hansen [this message]
2017-01-11 2:46 ` Junio C Hamano
2017-01-11 17:24 ` Richard Hansen
2017-01-11 18:15 ` Junio C Hamano
2017-01-11 18:36 ` Richard Hansen
2017-01-11 21:06 ` Junio C Hamano
2017-01-11 1:57 ` [PATCH v2 0/2] diff orderfile documentation improvements Richard Hansen
2017-01-11 1:57 ` [PATCH v2 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-11 1:57 ` [PATCH v2 2/2] diff: document the format of the -O (diff.orderFile) file Richard Hansen
2017-01-15 22:16 ` [PATCH v3 0/2] diff orderfile documentation improvements Richard Hansen
2017-01-15 22:16 ` [PATCH v3 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-15 22:16 ` [PATCH v3 2/2] diff: document the format of the -O (diff.orderFile) file Richard Hansen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17d48ccd-fd19-3922-8ee8-af6558d22632@google.com \
--to=hansenr@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).