On Mon, 2009-05-11 at 13:41 -0400, Joe Eykholt wrote: > Jan Zelený wrote: > > Hopefuly now it is ok, I checked and every line should be under 80 > > characters, > > only tabs used for indentation (:retab! command in vim): > > Some lines are still too long; it's columns that matter, not characters, > and where there are tabs, some lines still go past column 80. > > There were some unintentional changes (like in the copyright) > that I suppose were done by the retab command. > > But, it looks like the mailer problems are fixed, and the lines weren't > wrapped this time. > I'm having problems applying this patch. Can you tell me what I should be doing differently? I'm not sure if I should be giving git-am or patch different options or if I can repair the patch somehow. The header also shouldn't be changed as Joe pointed out. I can take care of that if you can help me with some syntax to apply the patch.
rwl...@fritz:open-fcoe$ git am --whitespace=fix ~/Desktop/bundle-21.mbox Applying: fcoeadm: long option support fix fatal: patch fragment without header at line 3: @@ -38,19 +38,19 @@ Copyright (c) 2009, Intel Corporation.\n and rwl...@fritz:open-fcoe$ patch -p1 < /home/rwlove/PATCHES/Re\:_ \[Open-FCoE\]_\[PATCH\]_fcoeadm\:_long_option_support_fix patching file fcoeadm.c Hunk #1 succeeded at 7 with fuzz 1. missing header for unified diff at line 82 of patch can't find file to patch at input line 82 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |with -------------------------- File to patch: ^C Also, in the future can you please make sure the patches apply with git-am, thanks... //Rob _______________________________________________ devel mailing list [email protected] http://www.open-fcoe.org/mailman/listinfo/devel
