From d819403a0b8fbbfce03774141404d6ffe3feee0e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 1 Jan 2024 11:06:06 +0000 Subject: [PATCH] git.sh: fix regression: patches before submodulse there isn't really a problem right now, but a desired and implemented behavioural change was that patches are to be applied *before* updating submodules. well, the previous commit reversed this change, under certain conditions, such that submodules were applied first. this patch fixes it, so that patches are done first. Signed-off-by: Leah Rowe --- include/git.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/git.sh b/include/git.sh index 01ee1cbb..1942a53b 100755 --- a/include/git.sh +++ b/include/git.sh @@ -115,9 +115,9 @@ clone_project() git_patch() { git -C "${1}" reset --hard ${rev} || err "!git reset ${1} <- ${rev}" - [ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \ - git_submodule_update "${1}" git_am_patches "$1" "$2" || err "git_patch $project: patch fail" + [ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \ + git_submodule_update "${1}"; return 0 } git_submodule_update()