fix: don't use fetchhead / update libgit / migrate patchable.toml files

dervoeti · dervoeti · commit b863cb8dc893 · 2025-04-30T14:48:47.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.dependencies]
 clap = { version = "4.5.27", features = ["derive"] }
-git2 = "0.20.0"
+git2 = "0.20.1"
 serde = { version = "1.0.217", features = ["derive"] }
 snafu = "0.8.5"
 tempfile = "3.16.0"
diff --git a/druid/stackable/patches/30.0.0/patchable.toml b/druid/stackable/patches/30.0.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/druid.git"
+upstream = "https://github.com/stackabletech/druid.git"
 base = "09d36ee324747f1407705c27618b6d415c3fa8a9"
diff --git a/druid/stackable/patches/30.0.1/patchable.toml b/druid/stackable/patches/30.0.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/druid.git"
+upstream = "https://github.com/stackabletech/druid.git"
 base = "a30af7a91d528e5c3a90356a5592abc7119191c6"
diff --git a/druid/stackable/patches/31.0.1/patchable.toml b/druid/stackable/patches/31.0.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/druid.git"
+upstream = "https://github.com/stackabletech/druid.git"
 base = "520482cb9638e452b0553595b4f29bb397a63758"
diff --git a/hadoop/stackable/patches/3.3.4/patchable.toml b/hadoop/stackable/patches/3.3.4/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hadoop.git"
+upstream = "https://github.com/stackabletech/hadoop.git"
 base = "a585a73c3e02ac62350c136643a5e7f6095a3dbb"
diff --git a/hadoop/stackable/patches/3.3.6/patchable.toml b/hadoop/stackable/patches/3.3.6/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hadoop.git"
+upstream = "https://github.com/stackabletech/hadoop.git"
 base = "1be78238728da9266a4f88195058f08fd012bf9c"
diff --git a/hadoop/stackable/patches/3.4.0/patchable.toml b/hadoop/stackable/patches/3.4.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hadoop.git"
+upstream = "https://github.com/stackabletech/hadoop.git"
 base = "bd8b77f398f626bb7791783192ee7a5dfaeec760"
diff --git a/hadoop/stackable/patches/3.4.1/patchable.toml b/hadoop/stackable/patches/3.4.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hadoop.git"
+upstream = "https://github.com/stackabletech/hadoop.git"
 base = "4d7825309348956336b8f06a08322b78422849b1"
diff --git a/hbase/stackable/patches/2.4.18/patchable.toml b/hbase/stackable/patches/2.4.18/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hbase.git"
+upstream = "https://github.com/stackabletech/hbase.git"
 base = "a1767f4d76859c0068720a6c1e5cb78282ebfe1e"
diff --git a/hbase/stackable/patches/2.6.0/patchable.toml b/hbase/stackable/patches/2.6.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hbase.git"
+upstream = "https://github.com/stackabletech/hbase.git"
 base = "de99f8754135ea69adc39da48d2bc2b2710a5366"
diff --git a/hbase/stackable/patches/2.6.1/patchable.toml b/hbase/stackable/patches/2.6.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hbase.git"
+upstream = "https://github.com/stackabletech/hbase.git"
 base = "7ed50b4dd742269a78875fb32112215f831284ff"
diff --git a/hive/stackable/patches/3.1.3/patchable.toml b/hive/stackable/patches/3.1.3/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hive.git"
+upstream = "https://github.com/stackabletech/hive.git"
 base = "4df4d75bf1e16fe0af75aad0b4179c34c07fc975"
diff --git a/hive/stackable/patches/4.0.0/patchable.toml b/hive/stackable/patches/4.0.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hive.git"
+upstream = "https://github.com/stackabletech/hive.git"
 base = "183f8cb41d3dbed961ffd27999876468ff06690c"
diff --git a/hive/stackable/patches/4.0.1/patchable.toml b/hive/stackable/patches/4.0.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/hive.git"
+upstream = "https://github.com/stackabletech/hive.git"
 base = "3af4517eb8cfd9407ad34ed78a0b48b57dfaa264"
diff --git a/kafka/stackable/patches/3.7.1/patchable.toml b/kafka/stackable/patches/3.7.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/kafka.git"
+upstream = "https://github.com/stackabletech/kafka.git"
 base = "e2494e6ffb89f8288ed2aeb9b5596c755210bffd"
diff --git a/kafka/stackable/patches/3.7.2/patchable.toml b/kafka/stackable/patches/3.7.2/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/kafka.git"
+upstream = "https://github.com/stackabletech/kafka.git"
 base = "79a8f2b5f44f9d5a6867190d1dfc463d08d60b82"
diff --git a/kafka/stackable/patches/3.8.0/patchable.toml b/kafka/stackable/patches/3.8.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/kafka.git"
+upstream = "https://github.com/stackabletech/kafka.git"
 base = "771b9576b00ecf5b64ab6e8bedf04156fbdb5cd6"
diff --git a/kafka/stackable/patches/3.9.0/patchable.toml b/kafka/stackable/patches/3.9.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/kafka.git"
+upstream = "https://github.com/stackabletech/kafka.git"
 base = "84caaa6e9da06435411510a81fa321d4f99c351f"
diff --git a/nifi/stackable/patches/1.27.0/patchable.toml b/nifi/stackable/patches/1.27.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/nifi.git"
+upstream = "https://github.com/stackabletech/nifi.git"
 base = "e0c4461d90bd4f6e5f2b81765bcff5cd97ed3e18"
diff --git a/nifi/stackable/patches/1.28.1/patchable.toml b/nifi/stackable/patches/1.28.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/nifi.git"
+upstream = "https://github.com/stackabletech/nifi.git"
 base = "883338fe28883733417d10f6ffa9319e75f5ea06"
diff --git a/nifi/stackable/patches/2.2.0/patchable.toml b/nifi/stackable/patches/2.2.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/nifi.git"
+upstream = "https://github.com/stackabletech/nifi.git"
 base = "b33ffac8aa10992482f7fa54e6cfccc46a5e8e27"
diff --git a/omid/stackable/patches/1.1.0/patchable.toml b/omid/stackable/patches/1.1.0/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/phoenix-omid.git"
+upstream = "https://github.com/stackabletech/phoenix-omid.git"
 base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c"
diff --git a/omid/stackable/patches/1.1.1/patchable.toml b/omid/stackable/patches/1.1.1/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/phoenix-omid.git"
+upstream = "https://github.com/stackabletech/phoenix-omid.git"
 base = "cd546d58d93f380fec9bf65dbfa618f53493f662"
diff --git a/omid/stackable/patches/1.1.2/patchable.toml b/omid/stackable/patches/1.1.2/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/phoenix-omid.git"
+upstream = "https://github.com/stackabletech/phoenix-omid.git"
 base = "88812c9e127063f3b3016262f81ea3e8b48ec157"
diff --git a/rust/patchable/src/main.rs b/rust/patchable/src/main.rs
@@ -309,7 +309,7 @@ fn main() -> Result<()> {
             let base_commit = repo::resolve_and_fetch_commitish(
                 &product_repo,
                 &config.base.to_string(),
-                &config.upstream
+                &config.upstream,
             )
             .context(FetchBaseCommitSnafu)?;
             let base_branch = ctx.base_branch();
@@ -501,7 +501,6 @@ fn main() -> Result<()> {
                         .is_ok();
 
                     if is_tag {
-                        // It's a tag
                         format!("{}:refs/tags/{}", base_commit_oid, base)
                     } else {
                         // Assume it's a branch as default behavior
diff --git a/rust/patchable/src/repo.rs b/rust/patchable/src/repo.rs
@@ -180,8 +180,8 @@ pub fn resolve_and_fetch_commitish(
                     &[commitish],
                     Some(
                         FetchOptions::new()
-                            .update_fetchhead(true)
-                            // download_tags is needed to later determine whether `commitish` is a tag or not
+                            // Tags need to be present to later determine whether `commitish` is a tag or not
+                            // Patchable needs to know this when initializing a repository with the `--forked` option (to construct the refspec)
                             .download_tags(git2::AutotagOption::Auto)
                             .remote_callbacks(callbacks)
                             // TODO: could be 1, CLI option maybe?
@@ -195,8 +195,7 @@ pub fn resolve_and_fetch_commitish(
                     refs: vec![commitish.to_string()],
                 })?;
             tracing::info!("fetched base commit");
-            // FETCH_HEAD is written by Remote::fetch to be the last reference fetched
-            repo.revparse_single("FETCH_HEAD")
+            repo.revparse_single(commitish)
                 .and_then(|obj| obj.peel_to_commit())
         }
         Err(err) => Err(err),
diff --git a/spark-k8s/stackable/patches/3.5.2/patchable.toml b/spark-k8s/stackable/patches/3.5.2/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/spark.git"
+upstream = "https://github.com/stackabletech/spark.git"
 base = "bb7846dd487f259994fdc69e18e03382e3f64f42"
diff --git a/spark-k8s/stackable/patches/3.5.5/patchable.toml b/spark-k8s/stackable/patches/3.5.5/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/spark.git"
+upstream = "https://github.com/stackabletech/spark.git"
 base = "7c29c664cdc9321205a98a14858aaf8daaa19db2"
diff --git a/trino-storage-connector/stackable/patches/451/patchable.toml b/trino-storage-connector/stackable/patches/451/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/snowlift/trino-storage.git"
+upstream = "https://github.com/stackabletech/trino-storage.git"
 base = "b6e5825bb84a4f1a3f89ff45ea39ce349313f60a"
diff --git a/trino-storage-connector/stackable/patches/455/patchable.toml b/trino-storage-connector/stackable/patches/455/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/snowlift/trino-storage.git"
+upstream = "https://github.com/stackabletech/trino-storage.git"
 base = "869a735d8be527117a19150e161ad8ca69317578"
diff --git a/trino-storage-connector/stackable/patches/470/patchable.toml b/trino-storage-connector/stackable/patches/470/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/snowlift/trino-storage.git"
+upstream = "https://github.com/stackabletech/trino-storage.git"
 base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
diff --git a/trino/stackable/patches/451/patchable.toml b/trino/stackable/patches/451/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/trinodb/trino.git"
+upstream = "https://github.com/stackabletech/trino.git"
 base = "2c974f7cb1d71e1f9f466941a317190a474fc432"
diff --git a/trino/stackable/patches/455/patchable.toml b/trino/stackable/patches/455/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/trinodb/trino.git"
+upstream = "https://github.com/stackabletech/trino.git"
 base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc"
diff --git a/trino/stackable/patches/470/patchable.toml b/trino/stackable/patches/470/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/trinodb/trino.git"
+upstream = "https://github.com/stackabletech/trino.git"
 base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
diff --git a/zookeeper/stackable/patches/3.9.2/patchable.toml b/zookeeper/stackable/patches/3.9.2/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/zookeeper.git"
+upstream = "https://github.com/stackabletech/zookeeper.git"
 base = "e454e8c7283100c7caec6dcae2bc82aaecb63023"
diff --git a/zookeeper/stackable/patches/3.9.3/patchable.toml b/zookeeper/stackable/patches/3.9.3/patchable.toml
@@ -1,2 +1,2 @@
-upstream = "https://github.com/apache/zookeeper.git"
+upstream = "https://github.com/stackabletech/zookeeper.git"
 base = "c26634f34490bb0ea7a09cc51e05ede3b4e320ee"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-upstream = "https://github.com/apache/druid.git"`
	`1`	`+upstream = "https://github.com/stackabletech/druid.git"`
`2`	`2`	`base = "09d36ee324747f1407705c27618b6d415c3fa8a9"`