Skip to content

Commit 07d05de

Browse files
committed
Remove git version suffix from patches
1 parent 8a65c10 commit 07d05de

9 files changed

+5
-25
lines changed

druid/stackable/patches/26.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,3 @@ index 0c6294f5ed..a33c6bd521 100644
4242
<module>extensions-core/druid-catalog</module>
4343
<module>extensions-core/testing-tools</module>
4444
<!-- Community extensions -->
45-
--
46-
2.48.1
47-

druid/stackable/patches/26.0.0/0002-Include-Prometheus-emitter-in-distribution.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,3 @@ index a6e72cf2c2..3ab13d5d11 100644
6464
<profile>
6565
<id>integration-test</id>
6666
<activation>
67-
--
68-
2.48.1
69-

druid/stackable/patches/26.0.0/0003-Stop-building-unused-extensions.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,3 @@ index a33c6bd521..f5001910e1 100644
6969
<pluginRepositories>
7070
<pluginRepository>
7171
<id>${repoOrgId}</id>
72-
--
73-
2.48.1
74-

druid/stackable/patches/26.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,3 @@ index f5001910e1..2364f27dc4 100644
132132
<!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
133133
<zookeeper.version>3.5.10</zookeeper.version>
134134
<checkerframework.version>2.5.7</checkerframework.version>
135-
--
136-
2.48.1
137-

druid/stackable/patches/26.0.0/0005-Include-jackson-dataformat-xml-dependency.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ index fdc6f1f548..9f18e614e9 100644
2727
<dependency>
2828
<groupId>com.fasterxml.jackson.datatype</groupId>
2929
<artifactId>jackson-datatype-joda</artifactId>
30-
--
31-
2.48.1
32-

druid/stackable/patches/26.0.0/0006-Stop-building-the-tar.gz-distribution.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ index ff8e0d2fdd..f9daa49e21 100644
2222
</formats>
2323
<fileSets>
2424
<fileSet>
25-
--
26-
2.48.1
27-

druid/stackable/patches/26.0.0/0007-Update-CycloneDX-plugin.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ index 2364f27dc4..c902899304 100644
2424
<executions>
2525
<execution>
2626
<phase>package</phase>
27-
--
28-
2.48.1
29-

druid/stackable/patches/26.0.0/0008-Fix-CVE-2024-36114.patch

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,3 @@ index c902899304..6c24bdc0b2 100644
4242
<!-- Compile Scope -->
4343
<dependency>
4444
<groupId>commons-codec</groupId>
45-
--
46-
2.48.1
47-

rust/patchable/src/patch.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,11 @@ pub fn format_patches(
345345
.arg(format!("{base_commit}..{leaf_commit}"))
346346
.arg("-o")
347347
.arg(patch_dir)
348-
.arg("--keep-subject")
348+
.args([
349+
"--keep-subject",
350+
// By default, git includes its own version number as a suffix, which makes patches unstable across git versions
351+
"--no-signature",
352+
])
349353
.status()
350354
.context(RunFormatMailSnafu)?;
351355
if !status.success() {

0 commit comments

Comments
 (0)