From 2592fcbab232aab354e7ad6f673f1c8168bdc044 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 29 Nov 2021 16:25:15 -0800 Subject: [PATCH] Ignore failure of first command. It's deliberate --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8906a80ad7..55a35082b7 100644 --- a/Makefile +++ b/Makefile @@ -324,5 +324,8 @@ clean-stm: .PHONY: fetch-submodules fetch-submodules: - git submodule update --init -N --depth 1 + # 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.) + git submodule update --init -N --depth 1 || true git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'