Merge pull request #203728 from Homebrew/jj-libgit2-1.9

jj: update to use libgit2 1.9

Author: BrewTestBot

Formula/j/jj.rb

@@ -4,24 +4,30 @@ class Jj < Formula
   url "https://github.com/jj-vcs/jj/archive/refs/tags/v0.25.0.tar.gz"
   sha256 "3a99528539e414a3373f24eb46a0f153d4e52f7035bb06df47bd317a19912ea3"
   license "Apache-2.0"
-  revision 1
+  revision 2
   head "https://github.com/martinvonz/jj.git", branch: "main"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia: "3584b23773db2bcc2f17d0e9ab7e43cbcb75666a7c426f30bb2353c502dd692a"
-    sha256 cellar: :any,                 arm64_sonoma:  "180144fac0063ecebad0df2e169d1454242b9d289e0926c939a0af66d0615f31"
-    sha256 cellar: :any,                 arm64_ventura: "c465e088aac79ff328457d4343408944f1cb6398a67ed4fb1d9af6029ddc78ae"
-    sha256 cellar: :any,                 sonoma:        "751941e6f433db1ea77b7a6dfc5680c45ebdefba203901fdaa73d37c83c6707a"
-    sha256 cellar: :any,                 ventura:       "3f105c85f77c9f739f958b280613afccfb54477710d8085d3f18169d4b40e4c9"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "e78f9c71743a969303d52e0a493aaee12b954df16ed1e0a85a03b2241a61cf00"
+    sha256 cellar: :any,                 arm64_sequoia: "e3a956a8e62358766302d59d592f6555fe9a97173c1dd9143534172ff6ba0e9f"
+    sha256 cellar: :any,                 arm64_sonoma:  "420d66af2270b1c3c5f6fae781537ebd0dbacd0d61f5cdd8ed6db77ca527989c"
+    sha256 cellar: :any,                 arm64_ventura: "6dc19cc8fbfd30e51b4d17eec7ee08559f01cdb9719128d026e07ba92830d1c6"
+    sha256 cellar: :any,                 sonoma:        "fdba90d9cbfa97802c6650f5007744e40ebbedd9e514688ac7fc5a0db614ea6f"
+    sha256 cellar: :any,                 ventura:       "1ac2997276b2d2b4f39ca0423df4a117736016554ad59e26bb607041f2bd2b59"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "1d7cd0534b257658bb96ad207550a7f09e045ac3f4a3fb5e4e3771af49be3416"
   end
 
   depends_on "pkgconf" => :build
   depends_on "rust" => :build
-  depends_on "libgit2@1.8" # needs https://github.com/rust-lang/git2-rs/issues/1109 to support libgit2 1.9
+  depends_on "libgit2"
   depends_on "openssl@3"
   uses_from_macos "zlib"
 
+  # patch to use libgit2 1.9, upstream pr ref, https://github.com/jj-vcs/jj/pull/5315
+  patch do
+    url "https://github.com/jj-vcs/jj/commit/b4f936ac302ee835aa274e4dd186b436781d5d2f.patch?full_index=1"
+    sha256 "7b2f84de2c6bbdce9934384af2f7f2d0b7f7116c4726aeef87581010cdf1564e"
+  end
+
   def install
     ENV["LIBGIT2_NO_VENDOR"] = "1"
 
@@ -45,7 +51,7 @@ def check_binary_linkage(binary, library)
     assert_predicate testpath/".jj", :exist?
 
     [
-      Formula["libgit2@1.8"].opt_lib/shared_library("libgit2"),
+      Formula["libgit2"].opt_lib/shared_library("libgit2"),
       Formula["openssl@3"].opt_lib/shared_library("libcrypto"),
       Formula["openssl@3"].opt_lib/shared_library("libssl"),
     ].each do |library|