On May 9, 2010, at 11:30 PM, Robert Spier wrote:
Applied manually to my tree as
e8cb1c3e94c9effc596aafb0442434d07098fc5d
another mangled patch.
I'm new to git, so I've been creating and emailing the patches per the
instructions in docs/development.pod. But apparently there's something
I'm not doing right.
I created the patches using git format-patch, which leaves the 000*
files in my git directory. Then I emailed to myself with git send-
email', cleaned up/shortened the subject (I belatedly realized that I
don't want to 'bundle' long descriptions in there), and then forwarded
them to the list. Should I send them directly to the list via 'git
send-email'?
General comments:
Please try and limit lines to 80 characters.
Should we add that to .perltidyrc?
-l=80 # Max line width is 80 cols
Please try and make the first line of the patch description short
(iirc, git likes <60 characters) and then use the 3rd and further
lines for explanation.)
If I'm understanding you correctly, the following patch should embody
what you just described. Right?
Matt
diff --git a/docs/development.pod b/docs/development.pod
index f991942..717246d 100644
--- a/docs/development.pod
+++ b/docs/development.pod
@@ -52,10 +52,15 @@ When you're ready to check it in...
git add lib/Qpsmtpd.pm # to let git know you changed the file
git add --patch plugin/tls # interactive choose which changes to add
git diff --cached # review changes added
- git commit
+ git commit # see 'Git commit notes' section
git log -p # review your commit a last time
git push origin # to send to github
+=head3 Git commit notes
+
+Make the first line of the patch description short (git likes <60
chars).
+Use the 3rd and further lines for explanation.
+
=head3 Submit patches by mail
The best way to submit patches to the project is to send them to the
Matt Simerson wrote:
added defined test to $local_port. It was emitting errors due to not
being defined. My previous commit to TcpServer.pm fixed the
definition
problem, this suppresses the error.
---
plugins/tls | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/plugins/tls b/plugins/tls
index 875bacf..ee8a5d4 100644
--- a/plugins/tls
+++ b/plugins/tls
@@ -148,7 +148,7 @@ sub hook_connect {
my ($self, $transaction) = @_;
my $local_port = $self->qp->connection->local_port;
- return DECLINED unless $local_port == 465; # SMTPS
+ return DECLINED unless (defined $local_port && $local_port ==
465); # SMTPS
unless (_convert_to_ssl($self)) {
return (DENY_DISCONNECT, "Cannot establish SSL session");
--
1.7.0.6
