From 6e73e80144d5dfd2f23dfd817698dcb210413c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sun, 30 Oct 2022 21:34:41 +0100
Subject: group/010.host_deps.group: adds git_host 2.35.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/git-no-owner-check.patch     | 25 -------------------------
 patches/git/git-no-owner-check.patch | 25 +++++++++++++++++++++++++
 patches/git_host                     |  1 +
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 patches/git-no-owner-check.patch
 create mode 100644 patches/git/git-no-owner-check.patch
 create mode 120000 patches/git_host

(limited to 'patches')

diff --git a/patches/git-no-owner-check.patch b/patches/git-no-owner-check.patch
deleted file mode 100644
index cc9d0141..00000000
--- a/patches/git-no-owner-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru git-2.35.5.orig/setup.c git-2.35.5/setup.c
---- git-2.35.5.orig/setup.c	2022-10-06 23:44:02.000000000 +0200
-+++ git-2.35.5/setup.c	2022-10-19 13:48:26.183628821 +0200
-@@ -1130,6 +1130,13 @@
- static int ensure_valid_ownership(const char *gitfile,
- 				const char *worktree, const char *gitdir)
- {
-+#ifdef __midipix__
-+	(void)gitfile;
-+	(void)worktree;
-+	(void)gitdir;
-+
-+	return 1;
-+#else
- 	struct safe_directory_data data = {
- 		.path = worktree ? worktree : gitdir
- 	};
-@@ -1148,6 +1155,7 @@
- 	read_very_early_config(safe_directory_cb, &data);
- 
- 	return data.is_safe;
-+#endif
- }
- 
- enum discovery_result {
diff --git a/patches/git/git-no-owner-check.patch b/patches/git/git-no-owner-check.patch
new file mode 100644
index 00000000..a4cf34db
--- /dev/null
+++ b/patches/git/git-no-owner-check.patch
@@ -0,0 +1,25 @@
+diff -ru git-2.35.5.orig/setup.c git-2.35.5/setup.c
+--- git-2.35.5.orig/setup.c	2022-10-06 23:44:02.000000000 +0200
++++ git-2.35.5/setup.c	2022-10-19 13:48:26.183628821 +0200
+@@ -1130,6 +1130,13 @@
+ static int ensure_valid_ownership(const char *gitfile,
+ 				const char *worktree, const char *gitdir)
+ {
++#if 1
++	(void)gitfile;
++	(void)worktree;
++	(void)gitdir;
++
++	return 1;
++#else
+ 	struct safe_directory_data data = {
+ 		.path = worktree ? worktree : gitdir
+ 	};
+@@ -1148,6 +1155,7 @@
+ 	read_very_early_config(safe_directory_cb, &data);
+ 
+ 	return data.is_safe;
++#endif
+ }
+ 
+ enum discovery_result {
diff --git a/patches/git_host b/patches/git_host
new file mode 120000
index 00000000..0899c299
--- /dev/null
+++ b/patches/git_host
@@ -0,0 +1 @@
+git
\ No newline at end of file
-- 
cgit v1.2.3