On 01/03/2017 03:46 PM, Arnaldo Carvalho de Melo wrote:
> you missed the delimiter here:
> 
> ---
> 
> Without it, I get:
> 
> [acme@jouet linux]$ am /wb/1.patch 
> Applying: tools lib traceevent: Fix prev/next_prio for deadline tasks
> fatal: patch with only garbage at line 3
> Patch failed at 0001 tools lib traceevent: Fix prev/next_prio for deadline 
> tasks
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> [acme@jouet linux]$ git am --abort
> 
> I added it manually and applied, please consider using 'git format-patch' 
> next time :-)

Odd, I applied this patch using git am before send it to be
sure git would not remove lines starting with "   #". It worked fine.

I did everything using git.. git commit, format-patch, tested with git
am on another branch, then send it using git send-email... it worked fine.

Am I missing something?

-- Daniel

Reply via email to