The patch does not apply on master, needs rebase.

Hmmm. "git apply pgbench-buffer-1.patch" works for me on current master.

Also, I got some whitespace errors.

It possible, but I cannot see any. Could you be more specific?

For me it failing, see below:

$ git log -1
commit ad4b7aeb84434c958e2df76fa69b68493a889e4a

Same for me, but it works:

  Switched to a new branch 'test'
  sh> git apply ~/pgbench-buffer-2.patch
  sh> git st
   On branch test
   Changes not staged for commit: ...
        modified:   src/bin/pgbench/pgbench.c

  sh> file ~/pgbench-buffer-2.patch
  .../pgbench-buffer-2.patch: unified diff output, ASCII text

  sh> sha1sum ~/pgbench-buffer-2.patch
  eab8167ef3ec5eca814c44b30e07ee5631914f07 ...

I suspect that your mailer did or did not do something with the attachment. Maybe try with "patch -p1 < foo.patch" at the root.

--
Fabien.


Reply via email to