three small patches for current git head

[K. "pestophagous" Heller]

On Wed, Oct 7, 2015 at 12:27 AM, Dirk Hohndel <dirk at hohndel.org> wrote:
> On Wed, Oct 07, 2015 at 08:55:00AM +0300, Miika Turkia wrote:
>> > When you pull the latest from github.com/torvalds/subsurface, if you (like
>> > me) are configured to open the default "username.xml" logbook on launch, you
>> > will likely discover a problem in commit e8a868aae of Oct 6.  See comments
>> > here:
>> >
>> > https://github.com/torvalds/subsurface/commit/e8a868aae2583fc3065b3ff150edb005cc32682b#commitcomment-13630347
>>
>> How about sending another patch for this one? (This has worked just
>> fine for me, but I am sure this is an issue in some environments.)
>
> I'll fix this here by making it a calloc as I had originally intended.
> :facepalm:
>
>> > Also, I have provided two (unrelated) bug fixes at:
>> >
>> > http://trac.subsurface-divelog.org/ticket/912  and
>> > http://trac.subsurface-divelog.org/ticket/820
>>
>> We generally prefer patches to be sent to the mailing list (to answer
>> your question in the bug comment). I personally use git send-email if
>> using properly configured laptop. You should tune the commit message
>> slightly in the future, adding the reference to the bug that is being
>> fixed in following format will close the bug automatically once
>> committed to master:
>>
>> Fixes #820
>
> All great advise - thanks Miika. I figured out how to get the commits from
> github (it's a multistep process but not as hard as I thought... if you
> attach ".patch" to the end of a commit link you can wget to download it as
> a patch that is formatted correctly for git am) and applied them. And I
> updated the commit messages to fix our automation syntax.

Thanks, Miika.  Next time I will use send-mail, and tune the tracker
id tag appropriately.

I am also glad to learn of this ".patch" trick on github. Github has
many secrets (and many annoyances).

>
>> Also a common warning, if your patch does not make it to master, or
>> get commented in a day or two, just remind us (Dirk) about it, he
>> might just have missed it for some reason.
>
> Yes. Definitely.
>
> I usually recommend (and git send-email does this) to make sure that your
> email has "[PATCH]" in the subject line. But with all my travel I still at
> times miss things (or my system randomly decides that a patch is spam).
> So a reminder is appreciated.

Excellent. It's very gracious of you to make that clear up front, so
people don't have to wonder if they will be seen as just "nagging you"
with reminders.

> The nice things about patches in email is that it's easy to comment on
> them and to make sure everyone sees the comments and other people can
> engage as well.

Agreed.

>  Qt... it's fun... it's easy...

hmmm. subjective ;)

/K