git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Apply patch on server w/o git

From
BDBryan Donlan <bdonlan@gmail.com>
Date
Mar 25, 2008, 18:41 UTC
Message-ID
<3e8340490803251141x6d199d8ch8828b396da202d81@mail.gmail.com>
In-Reply-To
<CA08AA77-A9EA-4490-B1BE-25E8B7402290@faithfulgeek.org>
On Tue, Mar 25, 2008 at 2:25 PM, Joe Fiorini <joe@faithfulgeek.org> wrote:
Show 24 quoted lines
> I am trying to generate a diff patch on my local dev box.  I want to
>  upload this patch to a server (running Windows Server 2008) and apply
>  it to my staging code.  The catch is: I cannot install git on the
>  server to accept the patch.  Therefore, I would like to use a generic
>  patching tool (such as patch from the GnuWin32 tools).  I tried
>  generating a unified diff with the following command:
>
>  git diff -U > diff.patch
>
>  and then tried to apply it using:
>
>  patch -u -i ..\other_dir\diff.patch
>
>  and I got the error:
>
>  "patch unexpectedly ends in middle of line" ... "Only garbage was
>  found in the patch input"
>
>  It might be a problem with how I'm using patch, and if so, forgive
>  me.  If not, then how can I generate a generic diff format from git so
>  I can do what I want?
>
>  Thanks all!
>  Joe Fiorini

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).

Previous: Joe FioriniNext: Joe Fiorini
Message 2 of 7 in “Apply patch on server w/o git”
  1. Joe FioriniMar 25, 2008
  2. Bryan DonlanMar 25, 2008
  3. Joe FioriniMar 25, 2008
  4. Jan HudecMar 25, 2008
  5. Robin RosenbergMar 25, 2008
  6. Joe FioriniMar 26, 2008
  7. Jan HudecMar 29, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.