From 3ec21b07fb9cb27f76ce515d265d7f73d66ba08a Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Tue, 8 Jun 2021 09:49:19 +0200 Subject: .gitmodules: Update intel-microcode submodule to track branch=main The 3rdparty submodule 'intel-microcode' has changed the branch from 'master' to 'main'. As we do not set any specific branch name in our config, it defaults to 'master' which makes "git submodule update --remote --rebase 3rdparty/intel-microcode" to fail. This patch adds the branch name in .gitmodules to match the upstream name. Change-Id: I7b6d7921a21af4eb3bcc7ce4e5a8ea21c38c89a3 Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/55305 Tested-by: build bot (Jenkins) Reviewed-by: Mario Scheithauer Reviewed-by: Marc Jones --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 010ab6b49dfe..1b47275290a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,7 @@ url = ../intel-microcode.git update = none ignore = dirty + branch = main [submodule "3rdparty/ffs"] path = 3rdparty/ffs url = ../ffs.git -- cgit v1.2.3