From: Jan Hudec <bulb@ucw.cz>
To: Bryan Donlan <bdonlan@gmail.com>
Cc: Joe Fiorini <joe@faithfulgeek.org>, git@vger.kernel.org
Subject: Re: Apply patch on server w/o git
Date: Tue, 25 Mar 2008 20:46:31 +0100 [thread overview]
Message-ID: <20080325194631.GD4857@efreet.light.src> (raw)
In-Reply-To: <3e8340490803251141x6d199d8ch8828b396da202d81@mail.gmail.com>
On Tue, Mar 25, 2008 at 14:41:04 -0400, Bryan Donlan wrote:
> Just a guess, but the gnuwin32 tools might not like unix line endings.
> Try opening and re-saving in wordpad (or vim :set ff=dos, or $insert
> your favorite method here).
That won't actually work! The problem is, that:
- The headers (+++/---/@@ lines) should have dos line endings (but does not
matter too much).
- The bodies must have the same line endings the actual code does.
Question is, what the code has (it could have been transfered by some method
that converted the line-endings or something).
Also trying to patch with ignoring whitespace could work (I believe I did
that the other way 'round -- applying windowsy newline-damaged patch on
unix). And if it does not, it's not the newlines problem.
--
Jan 'Bulb' Hudec <bulb@ucw.cz>
next prev parent reply other threads:[~2008-03-25 19:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-25 18:25 Apply patch on server w/o git Joe Fiorini
2008-03-25 18:41 ` Bryan Donlan
2008-03-25 19:23 ` Joe Fiorini
2008-03-25 19:46 ` Jan Hudec [this message]
2008-03-25 19:57 ` Robin Rosenberg
2008-03-26 3:03 ` Joe Fiorini
2008-03-29 18:46 ` Jan Hudec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080325194631.GD4857@efreet.light.src \
--to=bulb@ucw.cz \
--cc=bdonlan@gmail.com \
--cc=git@vger.kernel.org \
--cc=joe@faithfulgeek.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).