threads / patch / 46488

patchFix minor typo in git-diff docs.

Subject: [PATCH] Fix minor typo in git-diff docs.

## tl;dr

4 messages between Jul 31, 2017 and Jul 31, 2017. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Anthony Sottile· Jul 31, 2017, 14:00 UTC · lore

To be honest, I'm a bit overwhelmed by the documentation for submitting a patch!

I tried to follow as best I could, here's my attempt (please advise).

From e88ad689a7587c11f270a10f191a3b6bc52a90d4 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 31 Jul 2017 06:54:14 -0700
Subject: [PATCH] Fix minor typo in git-diff docs.

Signed-off-by: Anthony Sottile <asottile@umich.edu>
---
 Documentation/diff-options.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/diff-options.txt +1 −1

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 89cc0f4..43d18a4 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -392,7 +392,7 @@ endif::git-log[]
        the diff between the preimage and `/dev/null`. The resulting patch
        is not meant to be applied with `patch` or `git apply`; this is
        solely for people who want to just concentrate on reviewing the
-       text after the change. In addition, the output obviously lack
+       text after the change. In addition, the output obviously lacks
        enough information to apply such a patch in reverse, even manually,
        hence the name of the option.
 +

-- 
2.7.4

Junio C Hamano· Jul 31, 2017, 16:52 UTC · re: Anthony Sottile · lore

Re: [PATCH] Fix minor typo in git-diff docs.

Anthony Sottile <asottile@umich.edu> writes:

> To be honest, I'm a bit overwhelmed by the documentation for submitting a patch!
>
> I tried to follow as best I could, here's my attempt (please advise).

OK ;-)  Thanks for a patch.  Let's nitpick.

Our titles (your "Subject:" line in the e-mail header) state the area, colon and then a one line summary and ends without the final full stop, e.g.

    Subject: [PATCH] diff-options: grammar fix

Show 5 quoted lines

>
> From e88ad689a7587c11f270a10f191a3b6bc52a90d4 Mon Sep 17 00:00:00 2001
> From: Anthony Sottile <asottile@umich.edu>
> Date: Mon, 31 Jul 2017 06:54:14 -0700
> Subject: [PATCH] Fix minor typo in git-diff docs.

Generally these do not belong to the body of the message.

What object name the commit has locally in your repository is immaterial. Whose change it is, when it was shown to the general public for the first time, and what the title of the change is, are all in the e-mail header of your message.

One exception is when you cannot convince your e-mail client to put the name under which you sign-off the patch on the "From: " line in your e-mail header, or you are relaying somebody else's patch. You can then have "From: " line to record the right name, a blank line and then write body of the message.

>
> Signed-off-by: Anthony Sottile <asottile@umich.edu>

The space above "Signed-off-by: " is to describe what the change is about, when the title is not clear enough, but I think there is no need for such extra explanation for this particular patch.

Thanks for correcting my grammar.  Will queue with a tweaked title.

Show 17 quoted lines

> ---
>  Documentation/diff-options.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 89cc0f4..43d18a4 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -392,7 +392,7 @@ endif::git-log[]
>         the diff between the preimage and `/dev/null`. The resulting patch
>         is not meant to be applied with `patch` or `git apply`; this is
>         solely for people who want to just concentrate on reviewing the
> -       text after the change. In addition, the output obviously lack
> +       text after the change. In addition, the output obviously lacks
>         enough information to apply such a patch in reverse, even manually,
>         hence the name of the option.
>  +

Junio C Hamano· Jul 31, 2017, 16:59 UTC · re: Anthony Sottile · lore

Re: [PATCH] Fix minor typo in git-diff docs.

Anthony Sottile <asottile@umich.edu> writes:

Show 13 quoted lines

> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 89cc0f4..43d18a4 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -392,7 +392,7 @@ endif::git-log[]
>         the diff between the preimage and `/dev/null`. The resulting patch
>         is not meant to be applied with `patch` or `git apply`; this is
>         solely for people who want to just concentrate on reviewing the
> -       text after the change. In addition, the output obviously lack
> +       text after the change. In addition, the output obviously lacks
>         enough information to apply such a patch in reverse, even manually,
>         hence the name of the option.
>  +

Another thing that is more severe. You seem to have replaced all leading tabs with whitespaces, which makes the patch unusable. For this single character patch, I can pretend as if I applied your patch while making the fix myself in my editor, so there is no need to resend, but please make sure your e-mail client does not do that the next time.

Thanks.  Queued.

Anthony Sottile· Jul 31, 2017, 17:02 UTC · re: Junio C Hamano · lore

Re: [PATCH] Fix minor typo in git-diff docs.

Thanks!

I'll keep this in mind next time I send a patch.

Anthony

On Mon, Jul 31, 2017 at 9:59 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 24 quoted lines

> Anthony Sottile <asottile@umich.edu> writes:
>
>> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
>> index 89cc0f4..43d18a4 100644
>> --- a/Documentation/diff-options.txt
>> +++ b/Documentation/diff-options.txt
>> @@ -392,7 +392,7 @@ endif::git-log[]
>>         the diff between the preimage and `/dev/null`. The resulting patch
>>         is not meant to be applied with `patch` or `git apply`; this is
>>         solely for people who want to just concentrate on reviewing the
>> -       text after the change. In addition, the output obviously lack
>> +       text after the change. In addition, the output obviously lacks
>>         enough information to apply such a patch in reverse, even manually,
>>         hence the name of the option.
>>  +
>
> Another thing that is more severe.  You seem to have replaced all
> leading tabs with whitespaces, which makes the patch unusable.  For
> this single character patch, I can pretend as if I applied your
> patch while making the fix myself in my editor, so there is no need
> to resend, but please make sure your e-mail client does not do that
> the next time.
>
> Thanks.  Queued.