Mailinglist Archive: opensuse (1698 mails)

< Previous Next >
[opensuse] Need some help/insight with a git problem (patch rejected...)
So here's the situation:

I have a git repo and need to redo the history (don't ask why please) of a
couple of commits.

I created patch files for all 'evil' commit with "git format-patch".

Then I do "git reset --hard <last good commit>", fix the commit messages in the patch files by
hand and re-apply the patches with "git am <patchfile>".

This works for some patches, but for one it doesn't. It barfs at deleting a file "patch doesn't apply...". I've checked that the file it wants to delete is the correct one.

The error message is:

--- snip ---

Applying: Fixed the code due to changes in Arduino 1.0
error: patch failed: examples_advanced/xmas_chain/xmas_chain.cpp.hex:1
error: examples_advanced/xmas_chain/xmas_chain.cpp.hex: patch does not apply
Patch failed at 0001 Fixed the code due to changes in Arduino 1.0
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

--- snip ---

Then I tried "git apply --reject <patchfile>" and got this:

---snip ---

fatal: git apply: bad git-diff - expected /dev/null on line 21

--- snip ---

Line 21 of the patchfile reads:

+++ /dev/null

There are _no_ trailing spaces!

So I can't apply patches to a repo that were created from the same repo ???

What else can I do?

To unsubscribe, e-mail: opensuse+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: opensuse+owner@xxxxxxxxxxxx

< Previous Next >