Commit 9f24e2c
committed
fix: remove leading space from @@ -503 @@ hunk header in scylla 4.19.0.8 and 4.19.0.9 patches
git apply requires hunk headers (@@...@@) to start at column 0.
A leading space caused git apply to treat the header as a context
line, breaking the parse of the subsequent hunk and triggering:
'patch fragment without header at line N: @@ -643,6 ...'
Also correct the +c offset: after inserting the release:-fix hunk
(net +2 lines), the result-file line number for @@ -503 @@ is
503 + 3 (prior hunks) + 2 (release: fix) = 508, not 509/506.1 parent 71174e9 commit 9f24e2c
2 files changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
540 | 540 | | |
541 | 541 | | |
542 | 542 | | |
543 | | - | |
| 543 | + | |
544 | 544 | | |
545 | 545 | | |
546 | 546 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
221 | | - | |
| 221 | + | |
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
| |||
0 commit comments