[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [gpsd-dev] [PATCH 1/2] More 13-bit week number corrections.

From: Fred Wright
Subject: Re: [gpsd-dev] [PATCH 1/2] More 13-bit week number corrections.
Date: Fri, 15 Jul 2016 13:47:28 -0700 (PDT)

On Fri, 15 Jul 2016, Gary E. Miller wrote:
> On Fri, 15 Jul 2016 12:28:49 -0700 (PDT)
> Fred Wright <address@hidden> wrote:
> > Thanks.  Don't forget the related earlier one I emailed on 02-Jul
> > (which is why this one said "more" :-)).
> I thought I had all of your changes in now.  Please resubmit.

Ok, will do.

> > Please consider using "git am" to apply emailed patches generated with
> > "git format-patch" (all of mine, at least).  This takes the commit
> > message directly from the email, which is both less work and less
> > error-prone than creating a new commit message from scratch.  One can
> > still add an SOB line with "-s" if desired.  This is the way Eric
> > does it.
> Gack.  Email mungs patchs.  Which is why I had to manually apply.
> I like format-patch, but to really work it needs to be sent as an
> attachment.  Send you patchs as attachments and maybe I'll apply
> them as-is.

It must be your email client that's doing the munging.  I normally don't
use an email client to send patches at all; I just use "git send-email",
which talks to the SMTP server directly.

An even cleaner approach is to fetch directly from my GitHub repo (which
doesn't require having a GitHub account).  Patches via email are just sooo
twentieth-century. :-) But so far the only one who's taken patches that
way is Jon.

Try this:

        git fetch +doc-fixes:fwpatch

That will give you a new branch "fwpatch" derived from my doc-fixes
branch (where the missing patch lives).  Then you can diff and/or merge as
usual.  I've already rebased it to the current master, so it's
fast-forwardable ATM.

If that doesn't work, I'll send an attachment, though the non-attachment
approach seems to be better for most people (particularly when the sending
email client insists on encoding the attachment in a way that isn't
directly viewable in some clients).

Fred Wright

reply via email to

[Prev in Thread] Current Thread [Next in Thread]