git-pw icon indicating copy to clipboard operation
git-pw copied to clipboard

Failed to apply patch with scissors

Open vries opened this issue 2 months ago • 0 comments
trafficstars

I ran into the following problem while trying to apply this patch:

$ git-pw patch apply 120008
Failed to apply patch:
Applying: New '--binary-output' command line option, fix gdb.mi/ testing on Windows
error: No valid patches in input (allow with "--allow-empty")
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 New '--binary-output' command line option, fix gdb.mi/ testing on Windows

$ git am --show-current-patch=diff
--- 8< ---
$

The following things do work:

  • get the patch by saving email using Thunderbird, and use git am to apply it
  • get the patch using git-pw patch download --diff, and use patch to apply it

But this doesn't work (I suppose because it's the equivalent of git-pw patch apply):

  • use git-pw patch download --mbox and use git am to apply it

After downloading the patch in the mbox format, I took a look.

On a hunch, I removed the first line:

From patchwork Wed Sep 10 20:46:42 2025                                                        

and got:

$ git am v2-New---binary-output-command-line-option-fix-gdb.mi-testing-on-Windows.patch
Applying: New '--binary-output' command line option, fix gdb.mi/ testing on Windows
$

What I understand from this is that the mbox format that patchwork generates is incompatible with git am if the patch contains scissors.

vries avatar Sep 20 '25 07:09 vries