From f3098f566ca89f6d7ebc8e91e2a78e751a7ef924 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 30 Dec 2023 20:30:49 +0000 Subject: [PATCH] git.sh multi-tree: grab submodules *after* patches right now, if we want to patch a project such that certain submodules are no tdownloaded, or diffreent submodules are downloaded, or current ones are downloaded from other locations, we cannot do this, because we apply submodule updates *before* applying patches. therefore, we should change it so that they are applied *after* installing patches. 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 b0ebc937..27c2a3df 100755 --- a/include/git.sh +++ b/include/git.sh @@ -63,11 +63,11 @@ prepare_new_tree() cp -R "src/${project}/${project}" "${tmp_git_dir}" || \ err "prepare_new_tree ${project}/${tree}: can't make tmpclone" git_reset_rev "${tmp_git_dir}" "${rev}" + git_am_patches "${tmp_git_dir}" "$PWD/$cfgsdir/$tree/patches" || \ + err "prepare_new_tree ${project}/${tree}: patch fail" [ ! -f "${tmp_git_dir}/.gitmodules" ] || \ git -C "${tmp_git_dir}" submodule update --init --checkout \ || err "prepare_new_tree ${project}/${tree}: !submodules" - git_am_patches "${tmp_git_dir}" "$PWD/$cfgsdir/$tree/patches" || \ - err "prepare_new_tree ${project}/${tree}: patch fail" [ "${patchfail}" = "y" ] && err "PATCH FAIL" mv "${tmp_git_dir}" "src/${project}/${tree}" || \