{"thread":{"id":"38792","subject":"[Documentation] Submitting Patches","startedAt":"2015-03-13T06:31:30Z","lastAt":"2015-03-13T07:02:15Z","messageCount":2,"participants":["Cody Taylor","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"257634","messageId":"CAHWMk2YuUvYYb-nxdANVxZ0tLsyttnqNzpF74Nxz1zpFcGEnGg@mail.gmail.com","threadId":"38792","inReplyTo":null,"subject":"[Documentation] Submitting Patches","fromName":"Cody Taylor","fromEmail":"cody.taylor@maternityneighborhood.com","sentAt":"2015-03-13T06:31:30Z","receivedAt":"2015-03-13T06:31:30Z","isPatch":false,"sender":{"key":"cody.taylor@maternityneighborhood.com","avatar":null},"body":"Apologies for the poorly formatted e-mail. I realized after I sent the\nmessage that the `git send-mail` command was an option. I was trying\nto use python to modify the e-mail before sending it, and the three\ndifferent \"From\" fields got mumbled.\n\nAnyway, this brings up the point that `git send-email` should at least\nget a mention in the \"Documentation/SubmittingPatches\" file. Likely\nthe best place for this is a paragraph after `git format-patch` is\nmentioned in section 4 (\"Sending your patches.\").\n\nOn Fri, Mar 13, 2015 at 2:16 AM, Junio C Hamano wrote:\n>\n> Cody A Taylor writes:\n>\n> > From c861d5cb401110ce7d86b76c1eaa8e89e80f484e Mon Sep 17 00:00:00 2001\n> > From: Cody A Taylor \n> > Date: Thu, 12 Mar 2015 20:36:44 -0400\n> > Subject: [PATCH] git prompt: Use toplevel to find untracked files.\n>\n> All of the above four lines are unwanted in the e-mail body.\n>\n> * The first line is a separating line to make format-patch output\n> look like a mbox file, and does not even belong to this patch.\n>\n> * From: line, when you are not relaying somebody else's patch,\n> should not be necessary, as long as you set up your MUA correctly\n> so that the e-mail shows a correct From: in its header.\n>\n> * Date: is the same; unless you are relaying somebody else's patch,\n> in which case you might want to preserve the author timestamp,\n> the first time _we_ the recipients see your patch matters more,\n> which should be available from the e-mail header.\n>\n> * Subject: should be in the e-mail header. Sometimes when sending\n> a patch to an ongoing discussion that has its own subject, it is\n> handy to be able to override the title with in-body Subject:, but\n> this patch submission is not such a case. The subjects are the\n> same in the fourth line in the body (which should be dropped) and\n> in the header anyway in this message, so please edit it out.\n>\n> In short\n>\n> (1) If you cannot convince your mailer to show your @yahoo.com\n> address on the e-mail header From: line, then having the\n> in-body From: line above (i.e. the second line) is OK as a\n> workaround. We however would prefer if you didn't.\n>\n> (2) Edit the other three lines out.\n>\n> > The __git_ps1() prompt function would not show an untracked\n> > state when the current working directory was not a parent of\n> > the untracked file.\n>\n> Good find, and nicely explained. I wonder if we can add a test\n> or two to t9903-bash-prompt.sh?\n>\n> The patch itself makes sense. Thanks.\n>\n> > Signed-off-by: Cody A Taylor \n> > ---\n> > contrib/completion/git-prompt.sh | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\n> > index 214e859f99e7..f18aedc73be9 100644\n> > --- a/contrib/completion/git-prompt.sh\n> > +++ b/contrib/completion/git-prompt.sh\n> > @@ -487,7 +487,7 @@ __git_ps1 ()\n> >\n> > if [ -n \"${GIT_PS1_SHOWUNTRACKEDFILES-}\" ] &&\n> > [ \"$(git config --bool bash.showUntrackedFiles)\" != \"false\" ] &&\n> > - git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null\n> > + git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null\n> > then\n> > u=\"%${ZSH_VERSION+%}\"\n> > fi\n"},{"id":"257636","messageId":"xmqqa8zhz8g8.fsf@gitster.dls.corp.google.com","threadId":"38792","inReplyTo":"CAHWMk2YuUvYYb-nxdANVxZ0tLsyttnqNzpF74Nxz1zpFcGEnGg@mail.gmail.com","subject":"Re: [Documentation] Submitting Patches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-03-13T07:02:15Z","receivedAt":"2015-03-13T07:02:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Cody Taylor writes:\n\n> Anyway, this brings up the point that `git send-email` should at least\n> get a mention in the \"Documentation/SubmittingPatches\" file. Likely\n> the best place for this is a paragraph after `git format-patch` is\n> mentioned in section 4 (\"Sending your patches.\").\n\n[removed others who are not to be blamed for the lack of doc from cc]\n\nI very much agree with that---actually I am somewhat surprised that\nthe documentation doesn't do so already.\n\nPerhaps something like this?\n\n-- >8 --\nSubject: SubmittingPatches: nudge to use send-email\n\nIn step \"(4) Sending your patches\", we instruct users to do an\ninline patch, avoid breaking whitespaces, avoid attachments,\nuse [PATCH v2] for second round, etc., all of which send-email\nknows how to do.\n\nMention send-email at least once to gently nudge the user to (learn\nto) use it.\n\nSuggested-by: Cody Taylor \nSigned-off-by: Junio C Hamano \n---\n Documentation/SubmittingPatches | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex ef0eeb4..2b10569 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -154,7 +154,8 @@ you send off a message in the correct encoding.\n \n WARNING: Be wary of your MUAs word-wrap\n corrupting your patch. Do not cut-n-paste your patch; you can\n-lose tabs that way if you are not careful.\n+lose tabs that way if you are not careful. If you can use the\n+\"git send-email\" command, please do so.\n \n It is a common convention to prefix your subject line with\n [PATCH]. This lets people easily distinguish patches from other\n"}]}