threads / patch / 33120

patch, 19 partsspell checking

Subject: [PATCH 01/19] spell checking

## tl;dr

4 messages between Mar 9, 2013 and Mar 9, 2013. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Paul Campbell· Mar 9, 2013, 19:19 UTC · lore

>From 72fc84b6e5085b328cc90e664c9f85a1f5cde36c Mon Sep 17 00:00:00 2001

From: Paul Cartwright <paul.cartwright@ziilabs.com>
Date: Thu, 27 Jan 2011 22:33:06 +0800
Subject: [PATCH 01/19] spell checking

---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/subtree/git-subtree.txt +1 −1

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853e..e0957ee 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
 name

 You can omit the --squash flag, but doing so will increase the number
-of commits that are incldued in your local repository.
+of commits that are included in your local repository.

 We now have a ~/git-extensions/git-subtree directory containing code
 from the master branch of git://github.com/apenwarr/git-subtree.git

-- 
1.8.2.rc1


-- 
Paul [W] Campbell

Junio C Hamano· Mar 9, 2013, 19:45 UTC · re: Paul Campbell · lore

Re: [PATCH 01/19] spell checking

Paul Campbell <pcampbell@kemitix.net> writes:

Show 8 quoted lines

> From 72fc84b6e5085b328cc90e664c9f85a1f5cde36c Mon Sep 17 00:00:00 2001
> From: Paul Cartwright <paul.cartwright@ziilabs.com>
> Date: Thu, 27 Jan 2011 22:33:06 +0800
> Subject: [PATCH 01/19] spell checking
>
> ---
>  contrib/subtree/git-subtree.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I won't repeat these for other 18 patches, but please:

 - drop the first "From <object name> <magic timestamp>" line which
   is not part of the patch (it is only meant to help people who
   maintain the "file(1)" and "magic(5)");

 - keep "From: <author name> ..." and "Date: " lines for other
   peoples' patches you are forwarding (they can be dropped for your
   own patches); and

 - drop "Subject: " as that is the same as the subject of the e-mail
   message.

 - fix the subject to make it clear that the change is for
   contrib/subtree.

   "spell checking" [*1*] in the output of "git shortlog v1.8.1..",
   together with other 600+ patches' titles, will not help the
   reader to see how much activity each area had and who worked in
   what area.

 - have the authors sign-off their patches, and then add yours as
   the person who is forwarding other peoples' patches (see
   Documentation/SubmittingPatches).

 - Cc the area maintainer (I thought it was David Greene?)

if these patches are meant to become part of git.git eventually.

Thanks.

[Footnote]

*1* Besides, a patch can never be "spell *checking*".  It would be
 "typofix" after the author did a 'spell checking' ;-)

Paul Campbell· Mar 9, 2013, 20:07 UTC · re: Junio C Hamano · lore

Re: [PATCH 01/19] spell checking

On Sat, Mar 9, 2013 at 7:45 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

> Paul Campbell <pcampbell@kemitix.net> writes:
>
>> From 72fc84b6e5085b328cc90e664c9f85a1f5cde36c Mon Sep 17 00:00:00 2001
>> From: Paul Cartwright <paul.cartwright@ziilabs.com>
>> Date: Thu, 27 Jan 2011 22:33:06 +0800
>> Subject: [PATCH 01/19] spell checking
>>
>> ---
>>  contrib/subtree/git-subtree.txt | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> I won't repeat these for other 18 patches, but please:

Thanks and apologies. All noted, although I have a question below.

Show 18 quoted lines

>  - drop the first "From <object name> <magic timestamp>" line which
>    is not part of the patch (it is only meant to help people who
>    maintain the "file(1)" and "magic(5)");
>
>  - keep "From: <author name> ..." and "Date: " lines for other
>    peoples' patches you are forwarding (they can be dropped for your
>    own patches); and
>
>  - drop "Subject: " as that is the same as the subject of the e-mail
>    message.
>
>  - fix the subject to make it clear that the change is for
>    contrib/subtree.
>
>    "spell checking" [*1*] in the output of "git shortlog v1.8.1..",
>    together with other 600+ patches' titles, will not help the
>    reader to see how much activity each area had and who worked in
>    what area.

I'd wanted to avoid changing the original author's work as much as possible. Wrong choice on my part.

>  - have the authors sign-off their patches, and then add yours as
>    the person who is forwarding other peoples' patches (see
>    Documentation/SubmittingPatches).

Four of the eight original authors now have dead email addresses. As I found out when I started getting the mail bounces when I started sending these patches out. Would it be acceptable for those patches to leave the From line, add a Based-on-patch-by and then sign of myself? I've really only done enough on top of the cherry-picking to get round any conflicts.

>  - Cc the area maintainer (I thought it was David Greene?)
>
> if these patches are meant to become part of git.git eventually.

I knew that and forgot. Can I blame this on my head-cold? No?

Show 7 quoted lines

> Thanks.
>
>
> [Footnote]
>
> *1* Besides, a patch can never be "spell *checking*".  It would be
>  "typofix" after the author did a 'spell checking' ;-)

-- 
Paul [W] Campbell

Jonathan Nieder· Mar 9, 2013, 20:25 UTC · re: Paul Campbell · lore

Re: [PATCH 01/19] spell checking

Paul Campbell wrote:

> Four of the eight original authors now have dead email addresses. As I
> found out when I started getting the mail bounces when I started
> sending these patches out. Would it be acceptable for those patches to
> leave the From line, add a Based-on-patch-by and then sign of myself?

It's always nice to get the original author's sign-off, but if you can certify what's stated in the DCO1.1 (from Documentation/SubmittingPatches) then just adding your sign-off is fine. Please still keep the original authorship in that case, and no need to add a Based-on-patch-by line.

Thanks, Jonathan