Skip to content

Commit 495deb3

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 512f2cc + 5f8d3dc commit 495deb3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,11 @@ clean-nrf:
323323
clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326+
327+
# This update will fail because the commits we need aren't the latest on the
328+
# branch. We can ignore that though because we fix it with the second command.
329+
# (Only works for git servers that allow sha fetches.)
326330
.PHONY: fetch-submodules
327331
fetch-submodules:
328-
# This update will fail because the commits we need aren't the latest on the
329-
# branch. We can ignore that though because we fix it with the second command.
330-
# (Only works for git servers that allow sha fetches.)
331332
git submodule update --init -N --depth 1 || true
332333
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'

0 commit comments

Comments
 (0)