Update to pending libgit2 change 0b9216802ee929d3e0e94e8ce5519cd9b99d8d20.

timonvo · timonvo · commit b5e6f9edf345 · 2025-03-16T16:58:34.000-07:00
This fixes patch file -> diff -> patch file round tripping when binary data is included. See libgit2/libgit2#7051.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "libgit2-sys/libgit2"]
 	path = libgit2-sys/libgit2
-	url = https://github.com/libgit2/libgit2
+	url = https://github.com/timonvo/libgit2
diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
@@ -206,7 +206,7 @@ The build is now aborting. To disable, unset the variable or use `LIBGIT2_NO_VEN
     }
 
     // Use the CollisionDetection SHA1 implementation.
-    features.push_str("#define GIT_SHA1_COLLISIONDETECT 1\n");
+    features.push_str("#define GIT_SHA1_BUILTIN 1\n");
     cfg.define("SHA1DC_NO_STANDARD_INCLUDES", "1");
     cfg.define("SHA1DC_CUSTOM_INCLUDE_SHA1_C", "\"common.h\"");
     cfg.define("SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C", "\"common.h\"");
diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2
@@ -1 +1 @@
-Subproject commit 338e6fb681369ff0537719095e22ce9dc602dbf0
+Subproject commit 0b9216802ee929d3e0e94e8ce5519cd9b99d8d20

Original file line number	Diff line number	Diff line change
@@ -206,7 +206,7 @@ The build is now aborting. To disable, unset the variable or use `LIBGIT2_NO_VEN
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`// Use the CollisionDetection SHA1 implementation.`
`209`		`- features.push_str("#define GIT_SHA1_COLLISIONDETECT 1\n");`
	`209`	`+ features.push_str("#define GIT_SHA1_BUILTIN 1\n");`
`210`	`210`	`cfg.define("SHA1DC_NO_STANDARD_INCLUDES", "1");`
`211`	`211`	`cfg.define("SHA1DC_CUSTOM_INCLUDE_SHA1_C", "\"common.h\"");`
`212`	`212`	`cfg.define("SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C", "\"common.h\"");`