Date: Wed, 30 Sep 2009 15:00:14 -0400
To: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andy <genanr@emsphone.com>, linux-kernel@vger.kernel.org
Subject: Re: How can I download a git commit as a diff patch?
Message-ID: <20090930190014.GA22161@csclub.uwaterloo.ca>
References: <20090930154410.GA31502@thumper2> <20090930085500.a5856301.rdunlap@xenotime.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090930085500.a5856301.rdunlap@xenotime.net>
User-Agent: Mutt/1.5.18 (2008-05-17)
From: lsorense@csclub.uwaterloo.ca (Lennart Sorensen)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1597
Lines: 46

On Wed, Sep 30, 2009 at 08:55:00AM -0700, Randy Dunlap wrote:
> On Wed, 30 Sep 2009 10:44:10 -0500 Andy wrote:
> 
> > I just want to down a particular git commit as a patch, not a git commit or
> > anything.  Yes, I can see the diffs on the web, but unless I am missing
> > something all are in unless html formats for me.  And cut and past from the
> > web page does not help either because some lines get mangled.  Is there some
> > site, or git itself, that would allow be to get the git commit as a simple
> > patch?
> 
> Look at the commitdiff using the web interface, then click on "raw" near
> the upper left corner.

Of course some git diff's are not in a format that patch will like as
far as I can tell.

For example commit 6cdee2f96a97f6da26bd3759c3f8823332fbb438 which has
stuff like:
diff --cc drivers/net/ixp2000/ixpdev.c
index 588b44d,92fb823..1272434
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@@ -67,9 -68,9 +68,9 @@@ static int ixpdev_xmit(struct sk_buff *
        ip->tx_queue_entries++;
        if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
                netif_stop_queue(dev);
-       local_irq_enable();
+       local_irq_restore(flags);

 -      return 0;
 +      return NETDEV_TX_OK;
  }


Ehm, what does that mean?  patch doesn't like it.

Do git merges cause weird diffs?

-- 
Len Sorensen
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/