-
Notifications
You must be signed in to change notification settings - Fork 20
Open
Description
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 amto apply it - get the patch using
git-pw patch download --diff, and usepatchto apply it
But this doesn't work (I suppose because it's the equivalent of git-pw patch apply):
- use
git-pw patch download --mboxand usegit amto 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.
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels