From 4c8224b912336efab77e5024c1dc82cd1a44288c Mon Sep 17 00:00:00 2001
From: Christian Segundo
Date: Thu, 12 Oct 2023 16:06:19 +0200
Subject: Ignore git stuff in private submodule

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 2efc68e..95f3a52 100644
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,18 @@ merge: merge_check_dups
 	@# create directory structure
 	rsync -a --include '*/' --exclude '*' "private/" "merged"
 	rsync -a --include '*/' --exclude '*' "public/" "merged"
-	rm -rf merged/.git
+	rm -rf merged/.git merged/.git-crypt
 	@# link files to their destination
-	$(FIND) ./public -not \( -path ./public/.git -prune \) -type f -print0 |\
+	$(FIND) ./public -type f -print0 |\
 		xargs -0 -S 600 -I '{}' $(SHELL) -c '\
 			file={}; \
 			ln -s "$$(realpath $$file)" "./merged/$${file#./public/}"; \
 		'
-	$(FIND) ./private -not \( -path ./private/.git -prune \) -type f -print0 |\
-		xargs -0 -S 600 -I '{}' $(SHELL) -c '\
+	$(FIND) ./private \
+		-not \( -path ./private/.git -prune \) \
+		-not \( -path ./private/.git-crypt -prune \) \
+		-not \( -path ./private/.gitattributes -prune \) \
+		-type f -print0 | xargs -0 -S 600 -I '{}' $(SHELL) -c '\
 			file={}; \
 			ln -s "$$(realpath $$file)" "./merged/$${file#./private/}"; \
 		'
-- 
cgit v1.2.3