search

neilbrown / wiggle

apply rejected patches and perform word-wise diffs
http://neil.brown.name/wiggle
GNU General Public License v2.0
91 stars 8 forks source link

wiggle: cannot load file 'null' - No such file or director #22

Open dmikushin opened 2 years ago

dmikushin commented 2 years ago

When I'm trying to wiggle a git patch removing a file, I get the following error:

% wiggle -r -p1 0001-Removing-Boost-based-SSL-backend-replacing-it-with-C.patch
wiggle: bad unified patch at line 33
wiggle: file 1 missing
wiggle: cannot load file 'null' - No such file or directory
wiggle: cannot load file 'null' - No such file or directory

Clearly, the reason is this section in the patch:

diff --git a/include/tgbot/net/BoostHttpOnlySslClient.h b/include/tgbot/net/BoostHttpOnlySslClient.h
deleted file mode 100644
index dbe0c96..0000000
--- a/include/tgbot/net/BoostHttpOnlySslClient.h
+++ /dev/null

So far, this problem has not been raised by anyone. I'm filling an issue to get it more visibility. Is there an existing guideline to cope with this error?

neilbrown commented 2 years ago

What would you want wiggle to do in this case?

dmikushin commented 2 years ago

I've expected wiggle behavior be identical to "git am" or "git apply": the file in --- shall be deleted.

I'm not an expert, sorry if I'm expecting something unrelated.