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

---
 update-submodule | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'update-submodule')

diff --git a/update-submodule b/update-submodule
index 101994ccd..b47bd791d 100755
--- a/update-submodule
+++ b/update-submodule
@@ -6,10 +6,18 @@ url="$3"
 path="${url%% *}"
 url="${url#${path} }"
 
-if [ -n "$(ls -A "${path}")" ]; then
+if [ -d "${path}" ] && [ -n "$(ls -A "${path}")" ]; then
   git -C "${pkgSrcDir}" submodule update 2>/dev/null || true
   exit
 fi
+
+if [ ! -f "${path}" ]; then
+  >&2 echo 'update-submodule needs a commit'
+  exit 1
+fi
+
+commit=$(cat "${path}")
+rm "${path}"
 mkdir -p "${path}"
 if [ -d "${submoduleDir}" ]; then
   upstream="${submoduleDir}/${path}"
@@ -20,4 +28,5 @@ else
   upstream="${pkgSrcDir}/${path}"
 fi
 git -C "${upstream}" pull -q --ff-only
-git clone -q "${upstream}" "${path}"
+git -C "${upstream}" archive "${commit}" \
+| tar -C "${path}" -x
-- 
cgit v1.2.3-70-g09d2