HomeFreeBSD

devel/git-cinnabar: unbreak after c472db1cb7c6

Description

devel/git-cinnabar: unbreak after c472db1cb7c6

patch -p1 -F0 -o helper/fast-import.patched.c git-core/builtin/fast-import.c < helper/fast-import.c.patch
Hmm... Looks like a unified diff to me...

The text leading up to this was:

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 20406f6775..7ff0911c2c 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c

Patching file git-core/builtin/fast-import.c using Plan A...
Hunk #1 failed at 19.
Hunk #2 succeeded at 747 (offset 9 lines).
Hunk #3 succeeded at 848 (offset 9 lines).
Hunk #4 failed at 867.
Hunk #5 succeeded at 967 (offset 9 lines).
Hunk #6 succeeded at 1653 (offset 9 lines).
Hunk #7 succeeded at 2222 (offset 9 lines).
Hunk #8 succeeded at 2288 (offset 9 lines).
2 out of 8 hunks failed--saving rejects to helper/fast-import.patched.c.rej
done

Details

Provenance
jbeichAuthored on Apr 20 2022, 11:58 PM
Parents
R11:2eafd2a0535f: audio/lsp-plugins-lv2: Update 1.1.31 -> 1.2.0
Branches
Unknown
Tags
Unknown