From c0384b57f11838164b98f45d127686af3997408f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 21 Mar 2023 11:01:40 -0400 Subject: [PATCH 1/3] remove unused submodule tools/usb_descriptor --- .gitmodules | 3 --- tools/usb_descriptor | 1 - 2 files changed, 4 deletions(-) delete mode 160000 tools/usb_descriptor diff --git a/.gitmodules b/.gitmodules index 2ba84b4305..023892218a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,9 +33,6 @@ path = ports/atmel-samd/asf4 url = https://github.com/adafruit/asf4.git branch = circuitpython -[submodule "tools/usb_descriptor"] - path = tools/usb_descriptor - url = https://github.com/adafruit/usb_descriptor.git [submodule "lib/nrfutil"] path = lib/nrfutil url = https://github.com/adafruit/nRF52_nrfutil diff --git a/tools/usb_descriptor b/tools/usb_descriptor deleted file mode 160000 index 2eaa6114b2..0000000000 --- a/tools/usb_descriptor +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2eaa6114b209fe7f0a795eda8d6a7b3b93d76d2e From 98bff96d3c1245efe76262eee4709f015f0d2b22 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 21 Mar 2023 11:01:58 -0400 Subject: [PATCH 2/3] update tinyusb: fixes + no more submodules --- lib/tinyusb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tinyusb b/lib/tinyusb index ea8ecea59a..ec9c666107 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit ea8ecea59aa60a1028cce16b0f15bb33918b11af +Subproject commit ec9c666107c0be0f8dc7c2a15e3bdea8c44a50b4 From ae95274b66cb3bf72b5ff14421bd02137abee31c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 21 Mar 2023 11:43:33 -0400 Subject: [PATCH 3/3] use blobless partial clone for make fetch-submodules --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 91d842231f..50c86fc128 100644 --- a/Makefile +++ b/Makefile @@ -324,10 +324,9 @@ clean-stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean -# This update will fail because the commits we need aren't the latest on the -# branch. We can ignore that though because we fix it with the second command. -# (Only works for git servers that allow sha fetches.) +# Do blobless partial clones of submodules to save time and space. +# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.) +# so it does not have the idiosyncrasies of a shallow clone. .PHONY: fetch-submodules fetch-submodules: - git submodule update --init -N --depth 1 || true - git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1' + git submodule update --init --filter=blob:none