From 8f4b488a86a974b7b1c723d219d894d5b78bad5f Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 19 Feb 2020 11:46:35 +0100
Subject: update-submodule: archive should not contain git repos of submodules

---
 archPackagesUpdate | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'archPackagesUpdate')

diff --git a/archPackagesUpdate b/archPackagesUpdate
index bb59c67c..eec2fafb 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -214,6 +214,26 @@ echo '... done'
 # extract git ${branch}
 git -C "${pkgSrcDir}" archive --format tar "${branch}" | \
   tar -x -C "${tmpDir}" -f -
+git -C "${pkgSrcDir}" diff '6dc373759d940181bcb2a742f1f37548a7c1cacc' "${branch}" -- $(
+  sed '
+    s/^\[submodule "\([^"[:space:]]\+\)"\]$/\1/
+    t
+    d
+  ' "${tmpDir}/.gitmodules"
+) \
+| sed '
+  /^+++ b/ {
+    N
+    N
+    s#^+++ b/\(\S\+\)\n@@ -0,0 +1 @@\n+Subproject commit \([0-9a-f]\{40\}\)$#\1 \2#
+    t
+  }
+  d
+' \
+| while read -r module commit; do
+  rmdir "${tmpDir}/${module}"
+  echo "${commit}" >"${tmpDir}/${module}"
+done
 
 cd "${tmpDir}"
 
-- 
cgit v1.2.3-54-g00ecf