Skip to content

Commit 9f24e2c

Browse files
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

File tree

versions/scylla/4.19.0.8/patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ index e7b2b4e4a..a4b2ecea7 100644
540540
}
541541
// for 4.0 or 5.0 pre-releases, the CCM version string needs to be "4.0-alpha1", "4.0-alpha2" or
542542
// "5.0-beta1" Version.toString() always adds a patch value, even if it's not specified when
543-
@@ -503,7 +506,18 @@ public class CcmBridge implements AutoCloseable {
543+
@@ -503,7 +508,18 @@ public class CcmBridge implements AutoCloseable {
544544
}
545545

546546
public void addWithoutStart(int n, String dc) {

versions/scylla/4.19.0.9/patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ index e7b2b4e4a0..8fbbed8d95 100644
218218
}
219219
// for 4.0 or 5.0 pre-releases, the CCM version string needs to be "4.0-alpha1", "4.0-alpha2" or
220220
// "5.0-beta1" Version.toString() always adds a patch value, even if it's not specified when
221-
@@ -503,7 +509,18 @@ public class CcmBridge implements AutoCloseable {
221+
@@ -503,7 +508,18 @@ public class CcmBridge implements AutoCloseable {
222222
}
223223

224224
public void addWithoutStart(int n, String dc) {

0 commit comments

Comments
 (0)